V4L/DVB (7620): Adding support for a new i2c bridge type

[linux-2.6-omap-h63xx.git] / include / linux / nfs_fs_i.h

diff --git a/include/linux/nfs_fs_i.h b/include/linux/nfs_fs_i.h
index e9a749588a7bd887c1b803c55d34d74637dfef04..861730275ba0545feb6857c42f9d161d7f38d47c 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;
-       u32             flags;
        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