Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[sfrench/cifs-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 e2c18dabff8624ba8c526ddaa1cc50a5530db0de..861730275ba0545feb6857c42f9d161d7f38d47c 100644 (file)
--- a/include/linux/nfs_fs_i.h
+++ b/include/linux/nfs_fs_i.h
@@ -12,8 +12,8 @@ struct nlm_lockowner;
  */
 struct nfs_lock_info {
        u32             state;
-       u32             flags;
        struct nlm_lockowner *owner;
+       struct list_head list;
 };
 
 struct nfs4_lock_state;
@@ -21,10 +21,4 @@ struct nfs4_lock_info {
        struct nfs4_lock_state *owner;
 };
 
-/*
- * Lock flag values
- */
-#define NFS_LCK_GRANTED                0x0001          /* lock has been granted */
-#define NFS_LCK_RECLAIM                0x0002          /* lock marked for reclaiming */
-
 #endif