Merge branch 'master' into tk71

[mv-sheeva.git] / fs / coda / coda_fs_i.h

diff --git a/include/linux/coda_fs_i.h b/fs/coda/coda_fs_i.h
similarity index 75%
rename from include/linux/coda_fs_i.h
rename to fs/coda/coda_fs_i.h
index b3ef0c461578c834c1266dc10b0390c51658aae6..e35071b1de0e26a3d8f5e1ee27c1da3d3667a4ad 100644 (file)
--- a/include/linux/coda_fs_i.h
+++ b/fs/coda/coda_fs_i.h
@@ -10,19 +10,24 @@
 
 #include <linux/types.h>
 #include <linux/list.h>
+#include <linux/spinlock.h>
 #include <linux/coda.h>
 
 /*
  * coda fs inode data
+ * c_lock protects accesses to c_flags, c_mapcount, c_cached_epoch, c_uid and
+ * c_cached_perm.
+ * vfs_inode is set only when the inode is created and never changes.
+ * c_fid is set when the inode is created and should be considered immutable.
  */
 struct coda_inode_info {
-        struct CodaFid    c_fid;       /* Coda identifier */
-        u_short                   c_flags;     /* flags (see below) */
-       struct list_head   c_cilist;    /* list of all coda inodes */
+       struct CodaFid     c_fid;       /* Coda identifier */
+       u_short            c_flags;     /* flags (see below) */
        unsigned int       c_mapcount;  /* nr of times this inode is mapped */
        unsigned int       c_cached_epoch; /* epoch for cached permissions */
        vuid_t             c_uid;       /* fsuid for cached permissions */
-        unsigned int       c_cached_perm; /* cached access permissions */
+       unsigned int       c_cached_perm; /* cached access permissions */
+       spinlock_t         c_lock;
        struct inode       vfs_inode;
 };