diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-02-07 16:54:07 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-02-11 21:33:13 +0100 |
| commit | 65b62a29f719e937b5be1df472287f4c61e53ac6 (patch) | |
| tree | ea6b552a08883d92cfedb891044fa9697cbc5619 /fs/nfs/nfs4state.c | |
| parent | NFSv4: Fix up the return values of nfs4_open_delegation_recall (diff) | |
| download | linux-65b62a29f719e937b5be1df472287f4c61e53ac6.tar.xz linux-65b62a29f719e937b5be1df472287f4c61e53ac6.zip | |
NFSv4: Ensure delegation recall and byte range lock removal don't conflict
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>
Diffstat (limited to 'fs/nfs/nfs4state.c')
| -rw-r--r-- | fs/nfs/nfs4state.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index fff97228cdec..6ace365c6334 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -519,6 +519,7 @@ nfs4_alloc_state_owner(struct nfs_server *server, atomic_set(&sp->so_count, 1); INIT_LIST_HEAD(&sp->so_lru); seqcount_init(&sp->so_reclaim_seqcount); + mutex_init(&sp->so_delegreturn_mutex); return sp; } |