diff options
| author | Peng Tao <tao.peng@primarydata.com> | 2014-11-05 22:36:50 +0800 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-27 11:21:44 +0000 |
| commit | d6bd1c49447a881d235168eacc8d4d8ac8262767 (patch) | |
| tree | c24f2c0e3f2f924d12c118c434825a294de766c4 /include/linux | |
| parent | 50785403604a3ddff15c7058d29def7d1c0768d8 (diff) | |
| download | linux-stable-d6bd1c49447a881d235168eacc8d4d8ac8262767.tar.gz linux-stable-d6bd1c49447a881d235168eacc8d4d8ac8262767.tar.bz2 linux-stable-d6bd1c49447a881d235168eacc8d4d8ac8262767.zip | |
nfs: fix pnfs direct write memory leak
commit 8c393f9a721c30a030049a680e1bf896669bb279 upstream.
For pNFS direct writes, layout driver may dynamically allocate ds_cinfo.buckets.
So we need to take care to free them when freeing dreq.
Ideally this needs to be done inside layout driver where ds_cinfo.buckets
are allocated. But buckets are attached to dreq and reused across LD IO iterations.
So I feel it's OK to free them in the generic layer.
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nfs_xdr.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 2c35d524ffc6..a8f111be79a0 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -1231,11 +1231,22 @@ struct nfs41_free_stateid_res { unsigned int status; }; +static inline void +nfs_free_pnfs_ds_cinfo(struct pnfs_ds_commit_info *cinfo) +{ + kfree(cinfo->buckets); +} + #else struct pnfs_ds_commit_info { }; +static inline void +nfs_free_pnfs_ds_cinfo(struct pnfs_ds_commit_info *cinfo) +{ +} + #endif /* CONFIG_NFS_V4_1 */ struct nfs_page; |