diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-06-17 19:41:51 -0400 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-03 23:02:33 -0400 |
| commit | 4533a94725b43a5f3d28b1fe6e37bec743c295f9 (patch) | |
| tree | 0e9075984463c212524ad0afa263b30b2efc68c5 /fs/nfs | |
| parent | f522f71affc47a29923070144b190f416175d443 (diff) | |
| download | linux-stable-4533a94725b43a5f3d28b1fe6e37bec743c295f9.tar.gz linux-stable-4533a94725b43a5f3d28b1fe6e37bec743c295f9.tar.bz2 linux-stable-4533a94725b43a5f3d28b1fe6e37bec743c295f9.zip | |
pNFS: Fix a memory leak when attempted pnfs fails
[ Upstream commit 1ca018d28d96d07788474abf66a5f3e9594841f5 ]
pnfs_do_write() expects the call to pnfs_write_through_mds() to free the
pgio header and to release the layout segment before exiting. The problem
is that nfs_pgio_data_destroy() doesn't actually do this; it only frees
the memory allocated by nfs_generic_pgio().
Ditto for pnfs_do_read()...
Fix in both cases is to add a call to hdr->release(hdr).
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/pnfs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 883ee88e5f5e..2b3928794c6b 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1576,6 +1576,7 @@ pnfs_write_through_mds(struct nfs_pageio_descriptor *desc, desc->pg_recoalesce = 1; } nfs_pgio_data_destroy(hdr); + hdr->release(hdr); } static enum pnfs_try_status @@ -1692,6 +1693,7 @@ pnfs_read_through_mds(struct nfs_pageio_descriptor *desc, desc->pg_recoalesce = 1; } nfs_pgio_data_destroy(hdr); + hdr->release(hdr); } /* |