summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorPeng Tao <tao.peng@primarydata.com>2014-11-05 22:36:50 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-21 09:23:02 -0800
commit25e26c3e8b6c7921a8d44017b61d989dbe4e8649 (patch)
tree59e0cf475e8abd3a0a1f09cd76b04a1f353e0680 /fs
parent8274355d41957d06158db1111cb410d9574c5f9a (diff)
downloadrenesas_kernel-25e26c3e8b6c7921a8d44017b61d989dbe4e8649.tar.gz
renesas_kernel-25e26c3e8b6c7921a8d44017b61d989dbe4e8649.tar.bz2
renesas_kernel-25e26c3e8b6c7921a8d44017b61d989dbe4e8649.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 b8797ae6831..de2543d3c28 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -178,6 +178,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)