Merge tag 'nfsd-4.4-1' of git://linux-nfs.org/~bfields/linux

Pull nfsd fix from Bruce Fields:
 "Just one fix for a NFSv4 callback bug introduced in 4.4"

* tag 'nfsd-4.4-1' of git://linux-nfs.org/~bfields/linux:
  nfsd: don't hold ls_mutex across a layout recall

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 9ffef06b30d5..c9d6c715c0fb 100644
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c
@@ -616,6 +616,7 @@ nfsd4_cb_layout_prepare(struct nfsd4_callback *cb)
 
         mutex_lock(&ls->ls_mutex);
         nfs4_inc_and_copy_stateid(&ls->ls_recall_sid, &ls->ls_stid);
+        mutex_unlock(&ls->ls_mutex);
 }
 
 static int
@@ -659,7 +660,6 @@ nfsd4_cb_layout_release(struct nfsd4_callback *cb)
 
         trace_layout_recall_release(&ls->ls_stid.sc_stateid);
 
-        mutex_unlock(&ls->ls_mutex);
         nfsd4_return_all_layouts(ls, &reaplist);
         nfsd4_free_layouts(&reaplist);
         nfs4_put_stid(&ls->ls_stid);