Skip to content

Commit

Permalink
Merge tag 'nfsd-4.4-1' of git://linux-nfs.org/~bfields/linux
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed Dec 22, 2015
2 parents e73a317 + be20aa0 commit 0bee6ec
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/nfsd/nfs4layouts.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 0bee6ec

Please sign in to comment.