Patched in Tegra support.

4 files changed, 26 insertions, 35 deletions

diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c
index fb5b3ff79dc..98e54427439 100644
--- a/fs/omfs/dir.c
+++ b/fs/omfs/dir.c
@@ -255,7 +255,7 @@ static int omfs_remove(struct inode *dir, struct dentry *dentry)
         return 0;
 }
 
-static int omfs_add_node(struct inode *dir, struct dentry *dentry, umode_t mode)
+static int omfs_add_node(struct inode *dir, struct dentry *dentry, int mode)
 {
         int err;
         struct inode *inode = omfs_new_inode(dir, mode);
@@ -279,19 +279,19 @@ out_free_inode:
         return err;
 }
 
-static int omfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
+static int omfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
         return omfs_add_node(dir, dentry, mode | S_IFDIR);
 }
 
-static int omfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
-                bool excl)
+static int omfs_create(struct inode *dir, struct dentry *dentry, int mode,
+                struct nameidata *nd)
 {
         return omfs_add_node(dir, dentry, mode | S_IFREG);
 }
 
 static struct dentry *omfs_lookup(struct inode *dir, struct dentry *dentry,
-                                  unsigned int flags)
+                                  struct nameidata *nd)
 {
         struct buffer_head *bh;
         struct inode *inode = NULL;
diff --git a/fs/omfs/file.c b/fs/omfs/file.c
index e0d9b3e722b..2c6d95257a4 100644
--- a/fs/omfs/file.c
+++ b/fs/omfs/file.c
@@ -146,7 +146,8 @@ static int omfs_grow_extent(struct inode *inode, struct omfs_extent *oe,
                         be64_to_cpu(entry->e_blocks);
 
                 if (omfs_allocate_block(inode->i_sb, new_block)) {
-                        be64_add_cpu(&entry->e_blocks, 1);
+                        entry->e_blocks =
+                                cpu_to_be64(be64_to_cpu(entry->e_blocks) + 1);
                         terminator->e_blocks = ~(cpu_to_be64(
                                 be64_to_cpu(~terminator->e_blocks) + 1));
                         goto out;
@@ -176,7 +177,7 @@ static int omfs_grow_extent(struct inode *inode, struct omfs_extent *oe,
                 be64_to_cpu(~terminator->e_blocks) + (u64) new_count));
 
         /* write in new entry */
-        be32_add_cpu(&oe->e_extent_count, 1);
+        oe->e_extent_count = cpu_to_be32(1 + be32_to_cpu(oe->e_extent_count));
 
 out:
         *ret_block = new_block;
@@ -306,16 +307,6 @@ omfs_writepages(struct address_space *mapping, struct writeback_control *wbc)
         return mpage_writepages(mapping, wbc, omfs_get_block);
 }
 
-static void omfs_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);
-                omfs_truncate(inode);
-        }
-}
-
 static int omfs_write_begin(struct file *file, struct address_space *mapping,
                         loff_t pos, unsigned len, unsigned flags,
                         struct page **pagep, void **fsdata)
@@ -324,8 +315,11 @@ static int omfs_write_begin(struct file *file, struct address_space *mapping,
 
         ret = block_write_begin(mapping, pos, len, flags, pagep,
                                 omfs_get_block);
-        if (unlikely(ret))
-                omfs_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;
 }
@@ -357,11 +351,9 @@ static int omfs_setattr(struct dentry *dentry, struct iattr *attr)
 
         if ((attr->ia_valid & ATTR_SIZE) &&
             attr->ia_size != i_size_read(inode)) {
-                error = inode_newsize_ok(inode, attr->ia_size);
+                error = vmtruncate(inode, attr->ia_size);
                 if (error)
                         return error;
-                truncate_setsize(inode, attr->ia_size);
-                omfs_truncate(inode);
         }
 
         setattr_copy(inode, attr);
@@ -371,6 +363,7 @@ static int omfs_setattr(struct dentry *dentry, struct iattr *attr)
 
 const struct inode_operations omfs_file_inops = {
         .setattr = omfs_setattr,
+        .truncate = omfs_truncate
 };
 
 const struct address_space_operations omfs_aops = {
diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index 25d715c7c87..e043c4cb9a9 100644
--- a/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@ -28,7 +28,7 @@ struct buffer_head *omfs_bread(struct super_block *sb, sector_t block)
         return sb_bread(sb, clus_to_blk(sbi, block));
 }
 
-struct inode *omfs_new_inode(struct inode *dir, umode_t mode)
+struct inode *omfs_new_inode(struct inode *dir, int mode)
 {
         struct inode *inode;
         u64 new_block;
@@ -184,7 +184,7 @@ int omfs_sync_inode(struct inode *inode)
 static void omfs_evict_inode(struct inode *inode)
 {
         truncate_inode_pages(&inode->i_data, 0);
-        clear_inode(inode);
+        end_writeback(inode);
 
         if (inode->i_nlink)
                 return;
@@ -391,16 +391,12 @@ static int parse_options(char *options, struct omfs_sb_info *sbi)
                 case Opt_uid:
                         if (match_int(&args[0], &option))
                                 return 0;
-                        sbi->s_uid = make_kuid(current_user_ns(), option);
-                        if (!uid_valid(sbi->s_uid))
-                                return 0;
+                        sbi->s_uid = option;
                         break;
                 case Opt_gid:
                         if (match_int(&args[0], &option))
                                 return 0;
-                        sbi->s_gid = make_kgid(current_user_ns(), option);
-                        if (!gid_valid(sbi->s_gid))
-                                return 0;
+                        sbi->s_gid = option;
                         break;
                 case Opt_umask:
                         if (match_octal(&args[0], &option))
@@ -543,9 +539,11 @@ static int omfs_fill_super(struct super_block *sb, void *data, int silent)
                 goto out_brelse_bh2;
         }
 
-        sb->s_root = d_make_root(root);
-        if (!sb->s_root)
+        sb->s_root = d_alloc_root(root);
+        if (!sb->s_root) {
+                iput(root);
                 goto out_brelse_bh2;
+        }
         printk(KERN_DEBUG "omfs: Mounted volume %s\n", omfs_rb->r_name);
 
         ret = 0;
diff --git a/fs/omfs/omfs.h b/fs/omfs/omfs.h
index f0f8bc75e60..7d414fef501 100644
--- a/fs/omfs/omfs.h
+++ b/fs/omfs/omfs.h
@@ -19,8 +19,8 @@ struct omfs_sb_info {
         unsigned long **s_imap;
         int s_imap_size;
         struct mutex s_bitmap_lock;
-        kuid_t s_uid;
-        kgid_t s_gid;
+        int s_uid;
+        int s_gid;
         int s_dmask;
         int s_fmask;
 };
@@ -60,7 +60,7 @@ extern int omfs_shrink_inode(struct inode *inode);
 /* inode.c */
 extern struct buffer_head *omfs_bread(struct super_block *sb, sector_t block);
 extern struct inode *omfs_iget(struct super_block *sb, ino_t inode);
-extern struct inode *omfs_new_inode(struct inode *dir, umode_t mode);
+extern struct inode *omfs_new_inode(struct inode *dir, int mode);
 extern int omfs_reserve_block(struct super_block *sb, sector_t block);
 extern int omfs_find_empty_block(struct super_block *sb, int mode, ino_t *ino);
 extern int omfs_sync_inode(struct inode *inode);