Patched in Tegra support.

1 files changed, 12 insertions, 22 deletions

diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c
index 2de655f5d62..f81e250ac5c 100644
--- a/fs/ext2/ioctl.c
+++ b/fs/ext2/ioctl.c
@@ -35,7 +35,7 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
         case EXT2_IOC_SETFLAGS: {
                 unsigned int oldflags;
 
-                ret = mnt_want_write_file(filp);
+                ret = mnt_want_write(filp->f_path.mnt);
                 if (ret)
                         return ret;
 
@@ -77,41 +77,31 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 flags = flags & EXT2_FL_USER_MODIFIABLE;
                 flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
                 ei->i_flags = flags;
+                mutex_unlock(&inode->i_mutex);
 
                 ext2_set_inode_flags(inode);
                 inode->i_ctime = CURRENT_TIME_SEC;
-                mutex_unlock(&inode->i_mutex);
-
                 mark_inode_dirty(inode);
 setflags_out:
-                mnt_drop_write_file(filp);
+                mnt_drop_write(filp->f_path.mnt);
                 return ret;
         }
         case EXT2_IOC_GETVERSION:
                 return put_user(inode->i_generation, (int __user *) arg);
-        case EXT2_IOC_SETVERSION: {
-                __u32 generation;
-
+        case EXT2_IOC_SETVERSION:
                 if (!inode_owner_or_capable(inode))
                         return -EPERM;
-                ret = mnt_want_write_file(filp);
+                ret = mnt_want_write(filp->f_path.mnt);
                 if (ret)
                         return ret;
-                if (get_user(generation, (int __user *) arg)) {
+                if (get_user(inode->i_generation, (int __user *) arg)) {
                         ret = -EFAULT;
-                        goto setversion_out;
+                } else {
+                        inode->i_ctime = CURRENT_TIME_SEC;
+                        mark_inode_dirty(inode);
                 }
-
-                mutex_lock(&inode->i_mutex);
-                inode->i_ctime = CURRENT_TIME_SEC;
-                inode->i_generation = generation;
-                mutex_unlock(&inode->i_mutex);
-
-                mark_inode_dirty(inode);
-setversion_out:
-                mnt_drop_write_file(filp);
+                mnt_drop_write(filp->f_path.mnt);
                 return ret;
-        }
         case EXT2_IOC_GETRSVSZ:
                 if (test_opt(inode->i_sb, RESERVATION)
                         && S_ISREG(inode->i_mode)
@@ -131,7 +121,7 @@ setversion_out:
                 if (get_user(rsv_window_size, (int __user *)arg))
                         return -EFAULT;
 
-                ret = mnt_want_write_file(filp);
+                ret = mnt_want_write(filp->f_path.mnt);
                 if (ret)
                         return ret;
 
@@ -155,7 +145,7 @@ setversion_out:
                         rsv->rsv_goal_size = rsv_window_size;
                 }
                 mutex_unlock(&ei->truncate_mutex);
-                mnt_drop_write_file(filp);
+                mnt_drop_write(filp->f_path.mnt);
                 return 0;
         }
         default: