Patched in Tegra support.

4 files changed, 24 insertions, 37 deletions

diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h
index 585adafb0cc..718ac1f440c 100644
--- a/fs/adfs/adfs.h
+++ b/fs/adfs/adfs.h
@@ -46,8 +46,8 @@ struct adfs_sb_info {
         struct adfs_discmap *s_map;     /* bh list containing map                */
         struct adfs_dir_ops *s_dir;     /* directory operations                  */
 
-        kuid_t          s_uid;          /* owner uid                             */
-        kgid_t          s_gid;          /* owner gid                             */
+        uid_t           s_uid;          /* owner uid                             */
+        gid_t           s_gid;          /* owner gid                             */
         umode_t         s_owner_mask;   /* ADFS owner perm -> unix perm          */
         umode_t         s_other_mask;   /* ADFS other perm -> unix perm          */
         int             s_ftsuffix;     /* ,xyz hex filetype suffix option */
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c
index b3be2e7c564..3d83075aaa2 100644
--- a/fs/adfs/dir.c
+++ b/fs/adfs/dir.c
@@ -266,7 +266,7 @@ const struct dentry_operations adfs_dentry_operations = {
 };
 
 static struct dentry *
-adfs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
+adfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
 {
         struct inode *inode = NULL;
         struct object_info obj;
diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c
index 5f95d1ed9c6..d5250c5aae2 100644
--- a/fs/adfs/inode.c
+++ b/fs/adfs/inode.c
@@ -45,14 +45,6 @@ static int adfs_readpage(struct file *file, struct page *page)
         return block_read_full_page(page, adfs_get_block);
 }
 
-static void adfs_write_failed(struct address_space *mapping, loff_t to)
-{
-        struct inode *inode = mapping->host;
-
-        if (to > inode->i_size)
-                truncate_pagecache(inode, to, inode->i_size);
-}
-
 static int adfs_write_begin(struct file *file, struct address_space *mapping,
                         loff_t pos, unsigned len, unsigned flags,
                         struct page **pagep, void **fsdata)
@@ -63,8 +55,11 @@ static int adfs_write_begin(struct file *file, struct address_space *mapping,
         ret = cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
                                 adfs_get_block,
                                 &ADFS_I(mapping->host)->mmu_private);
-        if (unlikely(ret))
-                adfs_write_failed(mapping, pos + len);
+        if (unlikely(ret)) {
+                loff_t isize = mapping->host->i_size;
+                if (pos + len > isize)
+                        vmtruncate(mapping->host, isize);
+        }
 
         return ret;
 }
@@ -252,7 +247,7 @@ adfs_iget(struct super_block *sb, struct object_info *obj)
         inode->i_gid     = ADFS_SB(sb)->s_gid;
         inode->i_ino     = obj->file_id;
         inode->i_size    = obj->size;
-        set_nlink(inode, 2);
+        inode->i_nlink   = 2;
         inode->i_blocks  = (inode->i_size + sb->s_blocksize - 1) >>
                             sb->s_blocksize_bits;
 
@@ -309,8 +304,8 @@ adfs_notify_change(struct dentry *dentry, struct iattr *attr)
          * we can't change the UID or GID of any file -
          * we have a global UID/GID in the superblock
          */
-        if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, ADFS_SB(sb)->s_uid)) ||
-            (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, ADFS_SB(sb)->s_gid)))
+        if ((ia_valid & ATTR_UID && attr->ia_uid != ADFS_SB(sb)->s_uid) ||
+            (ia_valid & ATTR_GID && attr->ia_gid != ADFS_SB(sb)->s_gid))
                 error = -EPERM;
 
         if (error)
diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index d5712293579..c8bf36a1996 100644
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -15,7 +15,6 @@
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/statfs.h>
-#include <linux/user_namespace.h>
 #include "adfs.h"
 #include "dir_f.h"
 #include "dir_fplus.h"
@@ -127,14 +126,14 @@ static void adfs_put_super(struct super_block *sb)
         sb->s_fs_info = NULL;
 }
 
-static int adfs_show_options(struct seq_file *seq, struct dentry *root)
+static int adfs_show_options(struct seq_file *seq, struct vfsmount *mnt)
 {
-        struct adfs_sb_info *asb = ADFS_SB(root->d_sb);
+        struct adfs_sb_info *asb = ADFS_SB(mnt->mnt_sb);
 
-        if (!uid_eq(asb->s_uid, GLOBAL_ROOT_UID))
-                seq_printf(seq, ",uid=%u", from_kuid_munged(&init_user_ns, asb->s_uid));
-        if (!gid_eq(asb->s_gid, GLOBAL_ROOT_GID))
-                seq_printf(seq, ",gid=%u", from_kgid_munged(&init_user_ns, asb->s_gid));
+        if (asb->s_uid != 0)
+                seq_printf(seq, ",uid=%u", asb->s_uid);
+        if (asb->s_gid != 0)
+                seq_printf(seq, ",gid=%u", asb->s_gid);
         if (asb->s_owner_mask != ADFS_DEFAULT_OWNER_MASK)
                 seq_printf(seq, ",ownmask=%o", asb->s_owner_mask);
         if (asb->s_other_mask != ADFS_DEFAULT_OTHER_MASK)
@@ -176,16 +175,12 @@ static int parse_options(struct super_block *sb, char *options)
                 case Opt_uid:
                         if (match_int(args, &option))
                                 return -EINVAL;
-                        asb->s_uid = make_kuid(current_user_ns(), option);
-                        if (!uid_valid(asb->s_uid))
-                                return -EINVAL;
+                        asb->s_uid = option;
                         break;
                 case Opt_gid:
                         if (match_int(args, &option))
                                 return -EINVAL;
-                        asb->s_gid = make_kgid(current_user_ns(), option);
-                        if (!gid_valid(asb->s_gid))
-                                return -EINVAL;
+                        asb->s_gid = option;
                         break;
                 case Opt_ownmask:
                         if (match_octal(args, &option))
@@ -251,6 +246,7 @@ static struct inode *adfs_alloc_inode(struct super_block *sb)
 static void adfs_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(adfs_inode_cachep, ADFS_I(inode));
 }
 
@@ -280,11 +276,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(adfs_inode_cachep);
 }
 
@@ -379,8 +370,8 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
         sb->s_fs_info = asb;
 
         /* set default options */
-        asb->s_uid = GLOBAL_ROOT_UID;
-        asb->s_gid = GLOBAL_ROOT_GID;
+        asb->s_uid = 0;
+        asb->s_gid = 0;
         asb->s_owner_mask = ADFS_DEFAULT_OWNER_MASK;
         asb->s_other_mask = ADFS_DEFAULT_OTHER_MASK;
         asb->s_ftsuffix = 0;
@@ -492,9 +483,10 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
 
         sb->s_d_op = &adfs_dentry_operations;
         root = adfs_iget(sb, &root_obj);
-        sb->s_root = d_make_root(root);
+        sb->s_root = d_alloc_root(root);
         if (!sb->s_root) {
                 int i;
+                iput(root);
                 for (i = 0; i < asb->s_map_size; i++)
                         brelse(asb->s_map[i].dm_bh);
                 kfree(asb->s_map);