diff options
-rw-r--r-- | fs/ext4/ioctl.c | 3 | ||||
-rw-r--r-- | fs/ext4/move_extent.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 2220feb2dcc1..016d0249294f 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c | |||
@@ -258,7 +258,8 @@ setversion_out: | |||
258 | if (me.moved_len > 0) | 258 | if (me.moved_len > 0) |
259 | file_remove_suid(donor_filp); | 259 | file_remove_suid(donor_filp); |
260 | 260 | ||
261 | if (copy_to_user((struct move_extent *)arg, &me, sizeof(me))) | 261 | if (copy_to_user((struct move_extent __user *)arg, |
262 | &me, sizeof(me))) | ||
262 | err = -EFAULT; | 263 | err = -EFAULT; |
263 | mext_out: | 264 | mext_out: |
264 | fput(donor_filp); | 265 | fput(donor_filp); |
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index 7e99f4e72bf5..aa5fe28d180f 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c | |||
@@ -477,7 +477,6 @@ mext_leaf_block(handle_t *handle, struct inode *orig_inode, | |||
477 | struct ext4_extent *oext, *o_start, *o_end, *prev_ext; | 477 | struct ext4_extent *oext, *o_start, *o_end, *prev_ext; |
478 | struct ext4_extent new_ext, start_ext, end_ext; | 478 | struct ext4_extent new_ext, start_ext, end_ext; |
479 | ext4_lblk_t new_ext_end; | 479 | ext4_lblk_t new_ext_end; |
480 | ext4_fsblk_t new_phys_end; | ||
481 | int oext_alen, new_ext_alen, end_ext_alen; | 480 | int oext_alen, new_ext_alen, end_ext_alen; |
482 | int depth = ext_depth(orig_inode); | 481 | int depth = ext_depth(orig_inode); |
483 | int ret; | 482 | int ret; |
@@ -491,7 +490,6 @@ mext_leaf_block(handle_t *handle, struct inode *orig_inode, | |||
491 | new_ext.ee_len = dext->ee_len; | 490 | new_ext.ee_len = dext->ee_len; |
492 | new_ext_alen = ext4_ext_get_actual_len(&new_ext); | 491 | new_ext_alen = ext4_ext_get_actual_len(&new_ext); |
493 | new_ext_end = le32_to_cpu(new_ext.ee_block) + new_ext_alen - 1; | 492 | new_ext_end = le32_to_cpu(new_ext.ee_block) + new_ext_alen - 1; |
494 | new_phys_end = ext_pblock(&new_ext) + new_ext_alen - 1; | ||
495 | 493 | ||
496 | /* | 494 | /* |
497 | * Case: original extent is first | 495 | * Case: original extent is first |
@@ -932,7 +930,7 @@ out2: | |||
932 | } | 930 | } |
933 | 931 | ||
934 | /** | 932 | /** |
935 | * mext_check_argumants - Check whether move extent can be done | 933 | * mext_check_arguments - Check whether move extent can be done |
936 | * | 934 | * |
937 | * @orig_inode: original inode | 935 | * @orig_inode: original inode |
938 | * @donor_inode: donor inode | 936 | * @donor_inode: donor inode |