Patched in Tegra support.

9 files changed, 91 insertions, 74 deletions

diff --git a/fs/coda/cache.c b/fs/coda/cache.c
index 958ae0e0ff8..69015787618 100644
--- a/fs/coda/cache.c
+++ b/fs/coda/cache.c
@@ -89,13 +89,17 @@ int coda_cache_check(struct inode *inode, int mask)
 /* this won't do any harm: just flag all children */
 static void coda_flag_children(struct dentry *parent, int flag)
 {
+        struct list_head *child;
         struct dentry *de;
 
         spin_lock(&parent->d_lock);
-        list_for_each_entry(de, &parent->d_subdirs, d_u.d_child) {
+        list_for_each(child, &parent->d_subdirs)
+        {
+                de = list_entry(child, struct dentry, d_u.d_child);
                 /* don't know what to do with negative dentries */
-                if (de->d_inode ) 
-                        coda_flag_inode(de->d_inode, flag);
+                if ( ! de->d_inode ) 
+                        continue;
+                coda_flag_inode(de->d_inode, flag);
         }
         spin_unlock(&parent->d_lock);
         return; 
diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c
index 911cf30d057..6475877b076 100644
--- a/fs/coda/cnode.c
+++ b/fs/coda/cnode.c
@@ -88,21 +88,24 @@ struct inode * coda_iget(struct super_block * sb, struct CodaFid * fid,
    - link the two up if this is needed
    - fill in the attributes
 */
-struct inode *coda_cnode_make(struct CodaFid *fid, struct super_block *sb)
+int coda_cnode_make(struct inode **inode, struct CodaFid *fid, struct super_block *sb)
 {
         struct coda_vattr attr;
-        struct inode *inode;
         int error;
         
         /* We get inode numbers from Venus -- see venus source */
         error = venus_getattr(sb, fid, &attr);
-        if (error)
-                return ERR_PTR(error);
+        if ( error ) {
+            *inode = NULL;
+            return error;
+        } 
 
-        inode = coda_iget(sb, fid, &attr);
-        if (IS_ERR(inode))
+        *inode = coda_iget(sb, fid, &attr);
+        if ( IS_ERR(*inode) ) {
                 printk("coda_cnode_make: coda_iget failed\n");
-        return inode;
+                return PTR_ERR(*inode);
+        }
+        return 0;
 }
 
 
@@ -153,16 +156,19 @@ struct inode *coda_fid_to_inode(struct CodaFid *fid, struct super_block *sb)
 }
 
 /* the CONTROL inode is made without asking attributes from Venus */
-struct inode *coda_cnode_makectl(struct super_block *sb)
+int coda_cnode_makectl(struct inode **inode, struct super_block *sb)
 {
-        struct inode *inode = new_inode(sb);
-        if (inode) {
-                inode->i_ino = CTL_INO;
-                inode->i_op = &coda_ioctl_inode_operations;
-                inode->i_fop = &coda_ioctl_operations;
-                inode->i_mode = 0444;
-                return inode;
+        int error = -ENOMEM;
+
+        *inode = new_inode(sb);
+        if (*inode) {
+                (*inode)->i_ino = CTL_INO;
+                (*inode)->i_op = &coda_ioctl_inode_operations;
+                (*inode)->i_fop = &coda_ioctl_operations;
+                (*inode)->i_mode = 0444;
+                error = 0;
         }
-        return ERR_PTR(-ENOMEM);
+
+        return error;
 }
 
diff --git a/fs/coda/coda_fs_i.h b/fs/coda/coda_fs_i.h
index b24fdfd8a3f..e35071b1de0 100644
--- a/fs/coda/coda_fs_i.h
+++ b/fs/coda/coda_fs_i.h
@@ -49,9 +49,9 @@ struct coda_file_info {
 #define C_DYING       0x4   /* from venus (which died) */
 #define C_PURGE       0x8
 
-struct inode *coda_cnode_make(struct CodaFid *, struct super_block *);
+int coda_cnode_make(struct inode **, struct CodaFid *, struct super_block *);
 struct inode *coda_iget(struct super_block *sb, struct CodaFid *fid, struct coda_vattr *attr);
-struct inode *coda_cnode_makectl(struct super_block *sb);
+int coda_cnode_makectl(struct inode **inode, struct super_block *sb);
 struct inode *coda_fid_to_inode(struct CodaFid *fid, struct super_block *sb);
 void coda_replace_fid(struct inode *, struct CodaFid *, struct CodaFid *);
 
diff --git a/fs/coda/coda_linux.c b/fs/coda/coda_linux.c
index 854ace71268..2bdbcc11b37 100644
--- a/fs/coda/coda_linux.c
+++ b/fs/coda/coda_linux.c
@@ -104,7 +104,7 @@ void coda_vattr_to_iattr(struct inode *inode, struct coda_vattr *attr)
         if (attr->va_gid != -1)
                 inode->i_gid = (gid_t) attr->va_gid;
         if (attr->va_nlink != -1)
-                set_nlink(inode, attr->va_nlink);
+                inode->i_nlink = attr->va_nlink;
         if (attr->va_size != -1)
                 inode->i_size = attr->va_size;
         if (attr->va_size != -1)
diff --git a/fs/coda/coda_linux.h b/fs/coda/coda_linux.h
index cc0ea9fe5ec..44e17e9c21a 100644
--- a/fs/coda/coda_linux.h
+++ b/fs/coda/coda_linux.h
@@ -59,11 +59,12 @@ void coda_sysctl_clean(void);
 
 #define CODA_ALLOC(ptr, cast, size) do { \
     if (size < PAGE_SIZE) \
-        ptr = kzalloc((unsigned long) size, GFP_KERNEL); \
+        ptr = kmalloc((unsigned long) size, GFP_KERNEL); \
     else \
-        ptr = (cast)vzalloc((unsigned long) size); \
+        ptr = (cast)vmalloc((unsigned long) size); \
     if (!ptr) \
         printk("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__); \
+    else memset( ptr, 0, size ); \
 } while (0)
 
 
diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 49fe52d2560..0239433f50c 100644
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -30,14 +30,14 @@
 #include "coda_int.h"
 
 /* dir inode-ops */
-static int coda_create(struct inode *dir, struct dentry *new, umode_t mode, bool excl);
-static struct dentry *coda_lookup(struct inode *dir, struct dentry *target, unsigned int flags);
+static int coda_create(struct inode *dir, struct dentry *new, int mode, struct nameidata *nd);
+static struct dentry *coda_lookup(struct inode *dir, struct dentry *target, struct nameidata *nd);
 static int coda_link(struct dentry *old_dentry, struct inode *dir_inode, 
                      struct dentry *entry);
 static int coda_unlink(struct inode *dir_inode, struct dentry *entry);
 static int coda_symlink(struct inode *dir_inode, struct dentry *entry,
                         const char *symname);
-static int coda_mkdir(struct inode *dir_inode, struct dentry *entry, umode_t mode);
+static int coda_mkdir(struct inode *dir_inode, struct dentry *entry, int mode);
 static int coda_rmdir(struct inode *dir_inode, struct dentry *entry);
 static int coda_rename(struct inode *old_inode, struct dentry *old_dentry, 
                        struct inode *new_inode, struct dentry *new_dentry);
@@ -46,7 +46,7 @@ static int coda_rename(struct inode *old_inode, struct dentry *old_dentry,
 static int coda_readdir(struct file *file, void *buf, filldir_t filldir);
 
 /* dentry ops */
-static int coda_dentry_revalidate(struct dentry *de, unsigned int flags);
+static int coda_dentry_revalidate(struct dentry *de, struct nameidata *nd);
 static int coda_dentry_delete(const struct dentry *);
 
 /* support routines */
@@ -94,13 +94,14 @@ const struct file_operations coda_dir_operations = {
 
 /* inode operations for directories */
 /* access routines: lookup, readlink, permission */
-static struct dentry *coda_lookup(struct inode *dir, struct dentry *entry, unsigned int flags)
+static struct dentry *coda_lookup(struct inode *dir, struct dentry *entry, struct nameidata *nd)
 {
-        struct super_block *sb = dir->i_sb;
+        struct inode *inode = NULL;
+        struct CodaFid resfid = { { 0, } };
+        int type = 0;
+        int error = 0;
         const char *name = entry->d_name.name;
         size_t length = entry->d_name.len;
-        struct inode *inode;
-        int type = 0;
 
         if (length > CODA_MAXNAMLEN) {
                 printk(KERN_ERR "name too long: lookup, %s (%*s)\n",
@@ -110,20 +111,22 @@ static struct dentry *coda_lookup(struct inode *dir, struct dentry *entry, unsig
 
         /* control object, create inode on the fly */
         if (coda_isroot(dir) && coda_iscontrol(name, length)) {
-                inode = coda_cnode_makectl(sb);
+                error = coda_cnode_makectl(&inode, dir->i_sb);
                 type = CODA_NOCACHE;
-        } else {
-                struct CodaFid fid = { { 0, } };
-                int error = venus_lookup(sb, coda_i2f(dir), name, length,
-                                     &type, &fid);
-                inode = !error ? coda_cnode_make(&fid, sb) : ERR_PTR(error);
+                goto exit;
         }
 
-        if (!IS_ERR(inode) && (type & CODA_NOCACHE))
-                coda_flag_inode(inode, C_VATTR | C_PURGE);
+        error = venus_lookup(dir->i_sb, coda_i2f(dir), name, length,
+                             &type, &resfid);
+        if (!error)
+                error = coda_cnode_make(&inode, &resfid, dir->i_sb);
+
+        if (error && error != -ENOENT)
+                return ERR_PTR(error);
 
-        if (inode == ERR_PTR(-ENOENT))
-                inode = NULL;
+exit:
+        if (inode && (type & CODA_NOCACHE))
+                coda_flag_inode(inode, C_VATTR | C_PURGE);
 
         return d_splice_alias(inode, entry);
 }
@@ -188,7 +191,7 @@ static inline void coda_dir_drop_nlink(struct inode *dir)
 }
 
 /* creation routines: create, mknod, mkdir, link, symlink */
-static int coda_create(struct inode *dir, struct dentry *de, umode_t mode, bool excl)
+static int coda_create(struct inode *dir, struct dentry *de, int mode, struct nameidata *nd)
 {
         int error;
         const char *name=de->d_name.name;
@@ -220,7 +223,7 @@ err_out:
         return error;
 }
 
-static int coda_mkdir(struct inode *dir, struct dentry *de, umode_t mode)
+static int coda_mkdir(struct inode *dir, struct dentry *de, int mode)
 {
         struct inode *inode;
         struct coda_vattr attrs;
@@ -337,7 +340,7 @@ static int coda_rmdir(struct inode *dir, struct dentry *de)
         if (!error) {
                 /* VFS may delete the child */
                 if (de->d_inode)
-                        clear_nlink(de->d_inode);
+                    de->d_inode->i_nlink = 0;
 
                 /* fix the link count of the parent */
                 coda_dir_drop_nlink(dir);
@@ -536,12 +539,12 @@ out:
 }
 
 /* called when a cache lookup succeeds */
-static int coda_dentry_revalidate(struct dentry *de, unsigned int flags)
+static int coda_dentry_revalidate(struct dentry *de, struct nameidata *nd)
 {
         struct inode *inode;
         struct coda_inode_info *cii;
 
-        if (flags & LOOKUP_RCU)
+        if (nd->flags & LOOKUP_RCU)
                 return -ECHILD;
 
         inode = de->d_inode;
diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index be2aa490948..871b2771546 100644
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -21,6 +21,7 @@
 #include <linux/vfs.h>
 #include <linux/slab.h>
 
+#include <asm/system.h>
 #include <asm/uaccess.h>
 
 #include <linux/fs.h>
@@ -57,6 +58,7 @@ static struct inode *coda_alloc_inode(struct super_block *sb)
 static void coda_i_callback(struct rcu_head *head)
 {
         struct inode *inode = container_of(head, struct inode, i_rcu);
+        INIT_LIST_HEAD(&inode->i_dentry);
         kmem_cache_free(coda_inode_cachep, ITOC(inode));
 }
 
@@ -85,11 +87,6 @@ int coda_init_inodecache(void)
 
 void coda_destroy_inodecache(void)
 {
-        /*
-         * Make sure all delayed rcu free inodes are flushed before we
-         * destroy cache.
-         */
-        rcu_barrier();
         kmem_cache_destroy(coda_inode_cachep);
 }
 
@@ -112,41 +109,43 @@ static const struct super_operations coda_super_operations =
 
 static int get_device_index(struct coda_mount_data *data)
 {
-        struct fd f;
+        struct file *file;
         struct inode *inode;
         int idx;
 
-        if (data == NULL) {
+        if(data == NULL) {
                 printk("coda_read_super: Bad mount data\n");
                 return -1;
         }
 
-        if (data->version != CODA_MOUNT_VERSION) {
+        if(data->version != CODA_MOUNT_VERSION) {
                 printk("coda_read_super: Bad mount version\n");
                 return -1;
         }
 
-        f = fdget(data->fd);
-        if (!f.file)
-                goto Ebadf;
-        inode = f.file->f_path.dentry->d_inode;
-        if (!S_ISCHR(inode->i_mode) || imajor(inode) != CODA_PSDEV_MAJOR) {
-                fdput(f);
-                goto Ebadf;
+        file = fget(data->fd);
+        inode = NULL;
+        if(file)
+                inode = file->f_path.dentry->d_inode;
+        
+        if(!inode || !S_ISCHR(inode->i_mode) ||
+           imajor(inode) != CODA_PSDEV_MAJOR) {
+                if(file)
+                        fput(file);
+
+                printk("coda_read_super: Bad file\n");
+                return -1;
         }
 
         idx = iminor(inode);
-        fdput(f);
+        fput(file);
 
-        if (idx < 0 || idx >= MAX_CODADEVS) {
+        if(idx < 0 || idx >= MAX_CODADEVS) {
                 printk("coda_read_super: Bad minor number\n");
                 return -1;
         }
 
         return idx;
-Ebadf:
-        printk("coda_read_super: Bad file\n");
-        return -1;
 }
 
 static int coda_fill_super(struct super_block *sb, void *data, int silent)
@@ -206,16 +205,15 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
         printk("coda_read_super: rootfid is %s\n", coda_f2s(&fid));
         
         /* make root inode */
-        root = coda_cnode_make(&fid, sb);
-        if (IS_ERR(root)) {
-                error = PTR_ERR(root);
-                printk("Failure of coda_cnode_make for root: error %d\n", error);
-                goto error;
+        error = coda_cnode_make(&root, &fid, sb);
+        if ( error || !root ) {
+            printk("Failure of coda_cnode_make for root: error %d\n", error);
+            goto error;
         } 
 
         printk("coda_read_super: rootinode is %ld dev %s\n", 
                root->i_ino, root->i_sb->s_id);
-        sb->s_root = d_make_root(root);
+        sb->s_root = d_alloc_root(root);
         if (!sb->s_root) {
                 error = -EINVAL;
                 goto error;
@@ -223,6 +221,9 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
         return 0;
 
 error:
+        if (root)
+                iput(root);
+
         mutex_lock(&vc->vc_mutex);
         bdi_destroy(&vc->bdi);
         vc->vc_sb = NULL;
@@ -247,7 +248,7 @@ static void coda_put_super(struct super_block *sb)
 static void coda_evict_inode(struct inode *inode)
 {
         truncate_inode_pages(&inode->i_data, 0);
-        clear_inode(inode);
+        end_writeback(inode);
         coda_cache_clear_inode(inode);
 }
 
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index 761d5b31b18..8f616e0e252 100644
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -38,6 +38,7 @@
 #include <linux/mutex.h>
 #include <linux/device.h>
 #include <asm/io.h>
+#include <asm/system.h>
 #include <asm/poll.h>
 #include <asm/uaccess.h>
 
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index 0c68fd31fbf..9727e0c5257 100644
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -14,6 +14,7 @@
  * improvements to the Coda project. Contact Peter Braam <coda@cs.cmu.edu>.
  */
 
+#include <asm/system.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/types.h>