diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-06-17 19:41:51 -0400 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-07-15 10:00:42 +0100 |
| commit | 4bc3996f5a5df0882bfb0a8fe0d289bb81ca530f (patch) | |
| tree | 017a03294421e87b652039a18c6050e395812fe1 | |
| parent | 720a02a5f991cb45b6f414622d826cd8e0c4ad1d (diff) | |
pNFS: Fix a memory leak when attempted pnfs fails
commit 1ca018d28d96d07788474abf66a5f3e9594841f5 upstream.
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).
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -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 dea11c2c8c1e..77498f9ba554 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1558,6 +1558,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 @@ -1695,6 +1696,7 @@ pnfs_read_through_mds(struct nfs_pageio_descriptor *desc, desc->pg_recoalesce = 1; } nfs_pgio_data_destroy(hdr); + hdr->release(hdr); } /* |