Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging

possible.  Chainsawed RM200 kernel to compile again.  Jazz machine
status unknown.

1 files changed, 2 insertions, 12 deletions

diff --git a/include/linux/coda_fs_i.h b/include/linux/coda_fs_i.h
index 302a715b9..ac14c8e7f 100644
--- a/include/linux/coda_fs_i.h
+++ b/include/linux/coda_fs_i.h
@@ -13,8 +13,6 @@
 #include <linux/list.h>
 #include <linux/coda.h>
 
-
-
 #define CODA_CNODE_MAGIC        0x47114711
 /*
  * coda fs inode data
@@ -22,10 +20,6 @@
 struct coda_inode_info {
         struct ViceFid     c_fid;	/* Coda identifier */
         u_short	           c_flags;     /* flags (see below) */
-        u_short	           c_ocount;    /* count of openers */
-        u_short            c_owrite;    /* count of open for write */
-        u_short            c_mmcount;   /* count of mmappers */
-        struct inode      *c_ovp;       /* open inode  pointer */
         struct list_head   c_cnhead;    /* head of cache entries */
 	struct list_head   c_volrootlist; /* list of volroot cnoddes */
         struct inode      *c_vnode;     /*  inode associated with cnode */
@@ -34,14 +28,10 @@ struct coda_inode_info {
 
 /* flags */
 #define C_VATTR       0x1   /* Validity of vattr in inode */
-#define C_PURGE       0x8
-#define C_ZAPDIR      0x10
-#define C_DYING       0x4   /* from venus (which died) */
-#define C_INITED      0x20
 #define C_FLUSH       0x2   /* used after a flush */
+#define C_DYING       0x4   /* from venus (which died) */
+#define C_PURGE       0x8
 
-struct inode *coda_iget(struct super_block * sb, ViceFid * fid,
-                        struct coda_vattr * attr);
 int coda_cnode_make(struct inode **, struct ViceFid *, struct super_block *);
 int coda_cnode_makectl(struct inode **inode, struct super_block *sb);
 struct inode *coda_fid_to_inode(ViceFid *fid, struct super_block *sb);