[PATCH 4.6 053/203] NFS: Fix a double page unlock
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2016-07-25 22:21:03
Also in:
lkml
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2016-07-25 22:21:03
Also in:
lkml
4.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <redacted>
commit cbebaf897e5c4862567eb799dc84acc5d7ee2678 upstream.
Since commit 0bcbf039f6b2, nfs_readpage_release() has been used to
unlock the page in the read code.
Fixes: 0bcbf039f6b2 ("nfs: handle request add failure properly")
Signed-off-by: Trond Myklebust <redacted>
Signed-off-by: Anna Schumaker <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/nfs/read.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c@@ -367,13 +367,13 @@ readpage_async_filler(void *data, struct nfs_list_remove_request(new); nfs_readpage_release(new); error = desc->pgio->pg_error; - goto out_unlock; + goto out; } return 0; out_error: error = PTR_ERR(new); -out_unlock: unlock_page(page); +out: return error; }