coda: remove struct coda_sb_info

The sb_info structure only contains a single pointer to the character device,
there is no need for the added indirection.

Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 9 insertions, 23 deletions

diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index 29e441765600..6771a4271e33 100644
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -141,11 +141,10 @@ static int get_device_index(struct coda_mount_data *data)
 
 static int coda_fill_super(struct super_block *sb, void *data, int silent)
 {
-        struct inode *root = NULL; 
-        struct coda_sb_info *sbi = NULL;
+        struct inode *root = NULL;
         struct venus_comm *vc = NULL;
         struct CodaFid fid;
-        int error;
+        int error;
         int idx;
 
         idx = get_device_index((struct coda_mount_data *) data);
@@ -167,16 +166,9 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
                 return -EBUSY;
         }
 
-        sbi = kmalloc(sizeof(struct coda_sb_info), GFP_KERNEL);
-        if(!sbi) {
-                return -ENOMEM;
-        }
-
         vc->vc_sb = sb;
 
-        sbi->sbi_vcomm = vc;
-
-        sb->s_fs_info = sbi;
+        sb->s_fs_info = vc;
         sb->s_flags |= MS_NOATIME;
         sb->s_blocksize = 4096; /* XXXXX  what do we put here?? */
         sb->s_blocksize_bits = 12;
@@ -207,26 +199,20 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
         return 0;
 
  error:
-        if (sbi) {
-                kfree(sbi);
-                if(vc)
-                        vc->vc_sb = NULL;               
-        }
         if (root)
-                iput(root);
+                iput(root);
+        if (vc)
+                vc->vc_sb = NULL;
 
-        return -EINVAL;
+        return -EINVAL;
 }
 
 static void coda_put_super(struct super_block *sb)
 {
-        struct coda_sb_info *sbi;
-
-        sbi = coda_sbp(sb);
-        sbi->sbi_vcomm->vc_sb = NULL;
+        coda_vcp(sb)->vc_sb = NULL;
+        sb->s_fs_info = NULL;
 
         printk("Coda: Bye bye.\n");
-        kfree(sbi);
 }
 
 static void coda_clear_inode(struct inode *inode)