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>
This commit is contained in:
parent
d6bce5aed4
commit
86e9e37734
@ -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) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user