diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-02-15 14:59:52 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-23 08:44:39 +0100 |
| commit | a853de72abbe3996e7e9eb787d2fef1adae7f950 (patch) | |
| tree | 1bd0b72c6c075f1071465bcfe2c3c88877fc93d3 | |
| parent | 128f60fe3bb0b759cf52548fcb15683f91bd7d00 (diff) | |
NFS: Fix an I/O request leakage in nfs_do_recoalesce
commit 4d91969ed4dbcefd0e78f77494f0cb8fada9048a upstream.
Whether we need to exit early, or just reprocess the list, we
must not lost track of the request which failed to get recoalesced.
Fixes: 03d5eb65b538 ("NFS: Fix a memory leak in nfs_do_recoalesce")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org # v4.0+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/nfs/pagelist.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 79e941848e9d..1c9e979fa235 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -1107,7 +1107,6 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc) struct nfs_page *req; req = list_first_entry(&head, struct nfs_page, wb_list); - nfs_list_remove_request(req); if (__nfs_pageio_add_request(desc, req)) continue; if (desc->pg_error < 0) { |