Patch "NFS: Fix a double page unlock" has been added to the 4.6-stable tree

Patch "NFS: Fix a double page unlock" has been added to the 4.6-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    NFS: Fix a double page unlock

to the 4.6-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     nfs-fix-a-double-page-unlock.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From cbebaf897e5c4862567eb799dc84acc5d7ee2678 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Fri, 17 Jun 2016 16:48:25 -0400
Subject: NFS: Fix a double page unlock

From: Trond Myklebust <trond.myklebust@primarydata.com>

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 <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
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;
 }
 


Patches currently in stable-queue which might be from trond.myklebust@primarydata.com are

queue-4.6/nfs-fix-a-double-page-unlock.patch
queue-4.6/nfs-fix-another-open_downgrade-bug.patch
queue-4.6/pnfs_nfs-fix-_cancel_empty_pagelist.patch
queue-4.6/make-nfs_atomic_open-call-d_drop-on-all-open_context-errors.patch