projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux
[linux-2.6-block.git]
/
fs
/
nfsd
/
state.h
diff --git
a/fs/nfsd/state.h
b/fs/nfsd/state.h
index 0a47c6a6b3015f7e4253fda96cef67c870ba9860..2712042a66b197937936811057bac63fa7a3f382 100644
(file)
--- a/
fs/nfsd/state.h
+++ b/
fs/nfsd/state.h
@@
-486,7
+486,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;