Patched in Tegra support.

4 files changed, 8 insertions, 12 deletions

diff --git a/fs/efs/efs.h b/fs/efs/efs.h
index 5528926ac7f..d8305b582ab 100644
--- a/fs/efs/efs.h
+++ b/fs/efs/efs.h
@@ -129,7 +129,7 @@ extern struct inode *efs_iget(struct super_block *, unsigned long);
 extern efs_block_t efs_map_block(struct inode *, efs_block_t);
 extern int efs_get_block(struct inode *, sector_t, struct buffer_head *, int);
 
-extern struct dentry *efs_lookup(struct inode *, struct dentry *, unsigned int);
+extern struct dentry *efs_lookup(struct inode *, struct dentry *, struct nameidata *);
 extern struct dentry *efs_fh_to_dentry(struct super_block *sb, struct fid *fid,
                 int fh_len, int fh_type);
 extern struct dentry *efs_fh_to_parent(struct super_block *sb, struct fid *fid,
diff --git a/fs/efs/inode.c b/fs/efs/inode.c
index f3913eb2c47..9c13412e6c9 100644
--- a/fs/efs/inode.c
+++ b/fs/efs/inode.c
@@ -96,9 +96,9 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino)
         efs_inode = (struct efs_dinode *) (bh->b_data + offset);
     
         inode->i_mode  = be16_to_cpu(efs_inode->di_mode);
-        set_nlink(inode, be16_to_cpu(efs_inode->di_nlink));
-        i_uid_write(inode, (uid_t)be16_to_cpu(efs_inode->di_uid));
-        i_gid_write(inode, (gid_t)be16_to_cpu(efs_inode->di_gid));
+        inode->i_nlink = be16_to_cpu(efs_inode->di_nlink);
+        inode->i_uid   = (uid_t)be16_to_cpu(efs_inode->di_uid);
+        inode->i_gid   = (gid_t)be16_to_cpu(efs_inode->di_gid);
         inode->i_size  = be32_to_cpu(efs_inode->di_size);
         inode->i_atime.tv_sec = be32_to_cpu(efs_inode->di_atime);
         inode->i_mtime.tv_sec = be32_to_cpu(efs_inode->di_mtime);
diff --git a/fs/efs/namei.c b/fs/efs/namei.c
index 96f66d213a1..832b10ded82 100644
--- a/fs/efs/namei.c
+++ b/fs/efs/namei.c
@@ -58,8 +58,7 @@ static efs_ino_t efs_find_entry(struct inode *inode, const char *name, int len)
         return(0);
 }
 
-struct dentry *efs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
-{
+struct dentry *efs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) {
         efs_ino_t inodenum;
         struct inode *inode = NULL;
 
diff --git a/fs/efs/super.c b/fs/efs/super.c
index 2002431ef9a..0f31acb0131 100644
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -68,6 +68,7 @@ static struct inode *efs_alloc_inode(struct super_block *sb)
 static void efs_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(efs_inode_cachep, INODE_INFO(inode));
 }
 
@@ -96,11 +97,6 @@ static int init_inodecache(void)
 
 static void destroy_inodecache(void)
 {
-        /*
-         * Make sure all delayed rcu free inodes are flushed before we
-         * destroy cache.
-         */
-        rcu_barrier();
         kmem_cache_destroy(efs_inode_cachep);
 }
 
@@ -322,9 +318,10 @@ static int efs_fill_super(struct super_block *s, void *d, int silent)
                 goto out_no_fs;
         }
 
-        s->s_root = d_make_root(root);
+        s->s_root = d_alloc_root(root);
         if (!(s->s_root)) {
                 printk(KERN_ERR "EFS: get root dentry failed\n");
+                iput(root);
                 ret = -ENOMEM;
                 goto out_no_fs;
         }