Patched in Tegra support.

1 files changed, 7 insertions, 5 deletions

diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c
index 6083432f667..d53cb706f14 100644
--- a/fs/ocfs2/move_extents.c
+++ b/fs/ocfs2/move_extents.c
@@ -745,7 +745,7 @@ static int ocfs2_move_extent(struct ocfs2_move_extents_context *context,
          */
         ocfs2_probe_alloc_group(inode, gd_bh, &goal_bit, len, move_max_hop,
                                 new_phys_cpos);
-        if (!*new_phys_cpos) {
+        if (!new_phys_cpos) {
                 ret = -ENOSPC;
                 goto out_commit;
         }
@@ -1059,7 +1059,7 @@ int ocfs2_ioctl_move_extents(struct file *filp, void __user *argp)
         struct ocfs2_move_extents range;
         struct ocfs2_move_extents_context *context = NULL;
 
-        status = mnt_want_write_file(filp);
+        status = mnt_want_write(filp->f_path.mnt);
         if (status)
                 return status;
 
@@ -1082,7 +1082,8 @@ int ocfs2_ioctl_move_extents(struct file *filp, void __user *argp)
         context->file = filp;
 
         if (argp) {
-                if (copy_from_user(&range, argp, sizeof(range))) {
+                if (copy_from_user(&range, (struct ocfs2_move_extents *)argp,
+                                   sizeof(range))) {
                         status = -EFAULT;
                         goto out;
                 }
@@ -1137,13 +1138,14 @@ out:
          * length and new_offset even if failure happens somewhere.
          */
         if (argp) {
-                if (copy_to_user(argp, &range, sizeof(range)))
+                if (copy_to_user((struct ocfs2_move_extents *)argp, &range,
+                                sizeof(range)))
                         status = -EFAULT;
         }
 
         kfree(context);
 
-        mnt_drop_write_file(filp);
+        mnt_drop_write(filp->f_path.mnt);
 
         return status;
 }