diff options
| author | Jeff Layton | 2014-08-22 18:05:43 +0200 |
|---|---|---|
| committer | Jeff Layton | 2014-10-07 20:06:12 +0200 |
| commit | 0c637be884f5eaa0ee53396ea7686ec0de03d126 (patch) | |
| tree | 836e76037f50299616011f950d20bf5090cddabe /fs/nfsd/state.h | |
| parent | locks: clean up vfs_setlease kerneldoc comments (diff) | |
| download | kernel-qcow2-linux-0c637be884f5eaa0ee53396ea7686ec0de03d126.tar.gz kernel-qcow2-linux-0c637be884f5eaa0ee53396ea7686ec0de03d126.tar.xz kernel-qcow2-linux-0c637be884f5eaa0ee53396ea7686ec0de03d126.zip | |
nfsd: don't keep a pointer to the lease in nfs4_file
Now that we don't need to pass in an actual lease pointer to
vfs_setlease on unlock, we can stop tracking a pointer to the lease in
the nfs4_file.
Switch all of the places that check the fi_lease to check fi_deleg_file
instead. We always set that at the same time so it will have the same
semantics.
Cc: J. Bruce Fields <bfields@fieldses.org>
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/nfsd/state.h')
| -rw-r--r-- | fs/nfsd/state.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 4a89e00d7461..64f291a25a8c 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -477,7 +477,6 @@ struct nfs4_file { atomic_t fi_access[2]; u32 fi_share_deny; struct file *fi_deleg_file; - struct file_lock *fi_lease; atomic_t fi_delegees; struct knfsd_fh fi_fhandle; bool fi_had_conflict; |