Merge with Linux 2.4.0-test9. Please check DECstation, I had a number

of rejects to fixup while integrating Linus patches.  I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages.  I commit this anyway
since I found that the last CVS versions had the same problem.

1 files changed, 5 insertions, 2 deletions

diff --git a/include/linux/coda_fs_i.h b/include/linux/coda_fs_i.h
index ac14c8e7f..4a776e87f 100644
--- a/include/linux/coda_fs_i.h
+++ b/include/linux/coda_fs_i.h
@@ -20,9 +20,12 @@
 struct coda_inode_info {
         struct ViceFid     c_fid;	/* Coda identifier */
         u_short	           c_flags;     /* flags (see below) */
-        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 */
+	struct list_head   c_cilist;    /* list of all coda inodes */
+        struct inode      *c_vnode;     /* inode associated with cnode */
+        unsigned int       c_contcount; /* refcount for container inode */
+        struct coda_cred   c_cached_cred; /* credentials of cached perms */
+        unsigned int       c_cached_perm; /* cached access permissions */
         int                c_magic;     /* to verify the data structure */
 };