1 files changed, 11 insertions, 6 deletions

diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c
index 845b5a66952a..06855f6c7902 100644
--- a/fs/coda/cnode.c
+++ b/fs/coda/cnode.c
@@ -8,8 +8,8 @@
 #include <linux/time.h>
 
 #include <linux/coda.h>
-#include <linux/coda_psdev.h>
 #include <linux/pagemap.h>
+#include "coda_psdev.h"
 #include "coda_linux.h"
 
 static inline int coda_fideq(struct CodaFid *fid1, struct CodaFid *fid2)
@@ -137,11 +137,6 @@ struct inode *coda_fid_to_inode(struct CodaFid *fid, struct super_block *sb)
         struct inode *inode;
         unsigned long hash = coda_f2i(fid);
 
-        if ( !sb ) {
-                pr_warn("%s: no sb!\n", __func__);
-                return NULL;
-        }
-
         inode = ilookup5(sb, hash, coda_test_inode, fid);
         if ( !inode )
                 return NULL;
@@ -153,6 +148,16 @@ struct inode *coda_fid_to_inode(struct CodaFid *fid, struct super_block *sb)
         return inode;
 }
 
+struct coda_file_info *coda_ftoc(struct file *file)
+{
+        struct coda_file_info *cfi = file->private_data;
+
+        BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
+
+        return cfi;
+
+}
+
 /* the CONTROL inode is made without asking attributes from Venus */
 struct inode *coda_cnode_makectl(struct super_block *sb)
 {