NFSv4: Ensure delegation recall and byte range lock removal don't conflict
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 7 Feb 2013 15:54:07 +0000 (10:54 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 11 Feb 2013 20:33:13 +0000 (15:33 -0500)
Add a mutex to the struct nfs4_state_owner to ensure that delegation
recall doesn't conflict with byte range lock removal.

Note that we nest the new mutex _outside_ the state manager reclaim
protection (nfsi->rwsem) in order to avoid deadlocks.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/delegation.c
fs/nfs/nfs4_fs.h
fs/nfs/nfs4proc.c
fs/nfs/nfs4state.c

Simple merge
Simple merge
Simple merge
Simple merge