1 From 4d91969ed4dbcefd0e78f77494f0cb8fada9048a Mon Sep 17 00:00:00 2001
2 From: Trond Myklebust <trond.myklebust@hammerspace.com>
3 Date: Fri, 15 Feb 2019 14:59:52 -0500
4 Subject: NFS: Fix an I/O request leakage in nfs_do_recoalesce
6 From: Trond Myklebust <trond.myklebust@hammerspace.com>
8 commit 4d91969ed4dbcefd0e78f77494f0cb8fada9048a upstream.
10 Whether we need to exit early, or just reprocess the list, we
11 must not lost track of the request which failed to get recoalesced.
13 Fixes: 03d5eb65b538 ("NFS: Fix a memory leak in nfs_do_recoalesce")
14 Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
15 Cc: stable@vger.kernel.org # v4.0+
16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
19 fs/nfs/pagelist.c | 1 -
20 1 file changed, 1 deletion(-)
22 --- a/fs/nfs/pagelist.c
23 +++ b/fs/nfs/pagelist.c
24 @@ -1107,7 +1107,6 @@ static int nfs_do_recoalesce(struct nfs_
27 req = list_first_entry(&head, struct nfs_page, wb_list);
28 - nfs_list_remove_request(req);
29 if (__nfs_pageio_add_request(desc, req))
31 if (desc->pg_error < 0) {