summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorPeng Tao <tao.peng@primarydata.com>2014-11-05 22:36:50 +0800
committerLuis Henriques <luis.henriques@canonical.com>2014-11-27 11:21:44 +0000
commitd6bd1c49447a881d235168eacc8d4d8ac8262767 (patch)
treec24f2c0e3f2f924d12c118c434825a294de766c4 /fs
parent50785403604a3ddff15c7058d29def7d1c0768d8 (diff)
downloadlinux-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 'fs')
-rw-r--r--fs/nfs/direct.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 1b34eeb0d8de..73a3023e2702 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -270,6 +270,7 @@ static void nfs_direct_req_free(struct kref *kref)
{
struct nfs_direct_req *dreq = container_of(kref, struct nfs_direct_req, kref);
+ nfs_free_pnfs_ds_cinfo(&dreq->ds_cinfo);
if (dreq->l_ctx != NULL)
nfs_put_lock_context(dreq->l_ctx);
if (dreq->ctx != NULL)