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 20:11:35 +0100 |
| commit | 4fe2a7fda78a7275cd695e0219260d3a5572bc24 (patch) | |
| tree | 8ec31823308ff50c7403a86f3bc8308723afb30f /fs | |
| parent | e83b6ac7deed44e09f45bf13e837cd9e3ce23256 (diff) | |
| download | blackbird-obmc-linux-4fe2a7fda78a7275cd695e0219260d3a5572bc24.tar.gz blackbird-obmc-linux-4fe2a7fda78a7275cd695e0219260d3a5572bc24.zip | |
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>
Diffstat (limited to 'fs')
| -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 301880a3ad8e..03bde9a41451 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -1092,7 +1092,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) { |
