diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-02-07 10:54:07 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-02-11 15:33:13 -0500 |
| commit | 65b62a29f719e937b5be1df472287f4c61e53ac6 (patch) | |
| tree | ea6b552a08883d92cfedb891044fa9697cbc5619 /fs/nfs/nfs4_fs.h | |
| parent | 37380e4264dbda9753e470a30d4322097aab7152 (diff) | |
| download | op-kernel-dev-65b62a29f719e937b5be1df472287f4c61e53ac6.zip op-kernel-dev-65b62a29f719e937b5be1df472287f4c61e53ac6.tar.gz | |
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/nfs4_fs.h')
| -rw-r--r-- | fs/nfs/nfs4_fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index b12b734..944c9a5 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -93,6 +93,7 @@ struct nfs4_state_owner { struct list_head so_states; struct nfs_seqid_counter so_seqid; seqcount_t so_reclaim_seqcount; + struct mutex so_delegreturn_mutex; }; enum { |
