Patched in Tegra support.

1 files changed, 25 insertions, 29 deletions

diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index d47f11658c1..96a1b625fc7 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -35,16 +35,6 @@ static int hfs_readpage(struct file *file, struct page *page)
         return block_read_full_page(page, hfs_get_block);
 }
 
-static void hfs_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);
-                hfs_file_truncate(inode);
-        }
-}
-
 static int hfs_write_begin(struct file *file, struct address_space *mapping,
                         loff_t pos, unsigned len, unsigned flags,
                         struct page **pagep, void **fsdata)
@@ -55,8 +45,11 @@ static int hfs_write_begin(struct file *file, struct address_space *mapping,
         ret = cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
                                 hfs_get_block,
                                 &HFS_I(mapping->host)->phys_size);
-        if (unlikely(ret))
-                hfs_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;
 }
@@ -127,7 +120,6 @@ static ssize_t hfs_direct_IO(int rw, struct kiocb *iocb,
                 const struct iovec *iov, loff_t offset, unsigned long nr_segs)
 {
         struct file *file = iocb->ki_filp;
-        struct address_space *mapping = file->f_mapping;
         struct inode *inode = file->f_path.dentry->d_inode->i_mapping->host;
         ssize_t ret;
 
@@ -143,7 +135,7 @@ static ssize_t hfs_direct_IO(int rw, struct kiocb *iocb,
                 loff_t end = offset + iov_length(iov, nr_segs);
 
                 if (end > isize)
-                        hfs_write_failed(mapping, end);
+                        vmtruncate(inode, isize);
         }
 
         return ret;
@@ -177,7 +169,7 @@ const struct address_space_operations hfs_aops = {
 /*
  * hfs_new_inode
  */
-struct inode *hfs_new_inode(struct inode *dir, struct qstr *name, umode_t mode)
+struct inode *hfs_new_inode(struct inode *dir, struct qstr *name, int mode)
 {
         struct super_block *sb = dir->i_sb;
         struct inode *inode = new_inode(sb);
@@ -191,7 +183,7 @@ struct inode *hfs_new_inode(struct inode *dir, struct qstr *name, umode_t mode)
         inode->i_mode = mode;
         inode->i_uid = current_fsuid();
         inode->i_gid = current_fsgid();
-        set_nlink(inode, 1);
+        inode->i_nlink = 1;
         inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
         HFS_I(inode)->flags = 0;
         HFS_I(inode)->rsrc_inode = NULL;
@@ -228,7 +220,7 @@ struct inode *hfs_new_inode(struct inode *dir, struct qstr *name, umode_t mode)
         insert_inode_hash(inode);
         mark_inode_dirty(inode);
         set_bit(HFS_FLG_MDB_DIRTY, &HFS_SB(sb)->flags);
-        hfs_mark_mdb_dirty(sb);
+        sb->s_dirt = 1;
 
         return inode;
 }
@@ -243,7 +235,7 @@ void hfs_delete_inode(struct inode *inode)
                 if (HFS_I(inode)->cat_key.ParID == cpu_to_be32(HFS_ROOT_CNID))
                         HFS_SB(sb)->root_dirs--;
                 set_bit(HFS_FLG_MDB_DIRTY, &HFS_SB(sb)->flags);
-                hfs_mark_mdb_dirty(sb);
+                sb->s_dirt = 1;
                 return;
         }
         HFS_SB(sb)->file_count--;
@@ -256,7 +248,7 @@ void hfs_delete_inode(struct inode *inode)
                 }
         }
         set_bit(HFS_FLG_MDB_DIRTY, &HFS_SB(sb)->flags);
-        hfs_mark_mdb_dirty(sb);
+        sb->s_dirt = 1;
 }
 
 void hfs_inode_read_fork(struct inode *inode, struct hfs_extent *ext,
@@ -321,7 +313,7 @@ static int hfs_read_inode(struct inode *inode, void *data)
         /* Initialize the inode */
         inode->i_uid = hsb->s_uid;
         inode->i_gid = hsb->s_gid;
-        set_nlink(inode, 1);
+        inode->i_nlink = 1;
 
         if (idata->key)
                 HFS_I(inode)->cat_key = *idata->key;
@@ -497,7 +489,7 @@ out:
 }
 
 static struct dentry *hfs_file_lookup(struct inode *dir, struct dentry *dentry,
-                                      unsigned int flags)
+                                      struct nameidata *nd)
 {
         struct inode *inode = NULL;
         hfs_cat_rec rec;
@@ -540,7 +532,7 @@ out:
 void hfs_evict_inode(struct inode *inode)
 {
         truncate_inode_pages(&inode->i_data, 0);
-        clear_inode(inode);
+        end_writeback(inode);
         if (HFS_IS_RSRC(inode) && HFS_I(inode)->rsrc_inode) {
                 HFS_I(HFS_I(inode)->rsrc_inode)->rsrc_inode = NULL;
                 iput(HFS_I(inode)->rsrc_inode);
@@ -602,9 +594,9 @@ int hfs_inode_setattr(struct dentry *dentry, struct iattr * attr)
 
         /* no uig/gid changes and limit which mode bits can be set */
         if (((attr->ia_valid & ATTR_UID) &&
-             (!uid_eq(attr->ia_uid, hsb->s_uid))) ||
+             (attr->ia_uid != hsb->s_uid)) ||
             ((attr->ia_valid & ATTR_GID) &&
-             (!gid_eq(attr->ia_gid, hsb->s_gid))) ||
+             (attr->ia_gid != hsb->s_gid)) ||
             ((attr->ia_valid & ATTR_MODE) &&
              ((S_ISDIR(inode->i_mode) &&
                (attr->ia_mode != inode->i_mode)) ||
@@ -625,12 +617,9 @@ int hfs_inode_setattr(struct dentry *dentry, struct iattr * attr)
             attr->ia_size != i_size_read(inode)) {
                 inode_dio_wait(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);
-                hfs_file_truncate(inode);
         }
 
         setattr_copy(inode, attr);
@@ -655,7 +644,13 @@ static int hfs_file_fsync(struct file *filp, loff_t start, loff_t end,
 
         /* sync the superblock to buffers */
         sb = inode->i_sb;
-        flush_delayed_work(&HFS_SB(sb)->mdb_work);
+        if (sb->s_dirt) {
+                lock_super(sb);
+                sb->s_dirt = 0;
+                if (!(sb->s_flags & MS_RDONLY))
+                        hfs_mdb_commit(sb);
+                unlock_super(sb);
+        }
         /* .. finally sync the buffers to disk */
         err = sync_blockdev(sb->s_bdev);
         if (!ret)
@@ -679,6 +674,7 @@ static const struct file_operations hfs_file_operations = {
 
 static const struct inode_operations hfs_file_inode_operations = {
         .lookup         = hfs_file_lookup,
+        .truncate       = hfs_file_truncate,
         .setattr        = hfs_inode_setattr,
         .setxattr       = hfs_setxattr,
         .getxattr       = hfs_getxattr,