Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bee6ec8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e73a3177 be20aa00

fs/nfsd/nfs4layouts.c

+1 −1
Original line number Diff line number Diff line
@@ -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);