diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-06-17 22:48:25 +0200 |
|---|---|---|
| committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2016-06-24 18:01:00 +0200 |
| commit | cbebaf897e5c4862567eb799dc84acc5d7ee2678 (patch) | |
| tree | f1972b3becff09bddce7dcbe226af3edfafb1301 /fs/nfs | |
| parent | pnfs_nfs: fix _cancel_empty_pagelist (diff) | |
| download | linux-cbebaf897e5c4862567eb799dc84acc5d7ee2678.tar.xz linux-cbebaf897e5c4862567eb799dc84acc5d7ee2678.zip | |
NFS: Fix a double page unlock
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")
Cc: stable@vger.kernel.org # v4.5+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/read.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 6776d7a7839e..572e5b3b06f1 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -367,13 +367,13 @@ readpage_async_filler(void *data, struct page *page) 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; } |