git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
nfs_fs_i.h
diff --git
a/include/linux/nfs_fs_i.h
b/include/linux/nfs_fs_i.h
index
e9a7495
..
8617302
100644
(file)
--- a/
include/linux/nfs_fs_i.h
+++ b/
include/linux/nfs_fs_i.h
@@
-12,14
+12,13
@@
struct nlm_lockowner;
*/
struct nfs_lock_info {
u32 state;
*/
struct nfs_lock_info {
u32 state;
- u32 flags;
struct nlm_lockowner *owner;
struct nlm_lockowner *owner;
+ struct list_head list;
};
};
-/*
- * Lock flag values
- */
-#define NFS_LCK_GRANTED 0x0001 /* lock has been granted */
-#define NFS_LCK_RECLAIM 0x0002 /* lock marked for reclaiming */
+struct nfs4_lock_state;
+struct nfs4_lock_info {
+ struct nfs4_lock_state *owner;
+};
#endif
#endif