Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c437b2733520599a2c6e0dbcdeae611319f84707

Authored by Akira Fujita
Committed by Theodore Ts'o
1 parent 7247c0caa2
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ext4: Code cleanup for EXT4_IOC_MOVE_EXT ioctl 

a) Fix sparse warning in ext4_ioctl()
b) Remove unneeded variable in mext_leaf_block()
c) Fix spelling typo in mext_check_arguments()

Signed-off-by: Akira Fujita <a-fujita@rs.jp.nec.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Showing 2 changed files with 3 additions and 4 deletions Side-by-side Diff

... ... @@ -258,7 +258,8 @@
258 258 if (me.moved_len > 0)
259 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 263 err = -EFAULT;
263 264 mext_out:
264 265 fput(donor_filp);
fs/ext4/move_extent.c
Diff comments   View file @ c437b27
... ... @@ -477,7 +477,6 @@
477 477 struct ext4_extent *oext, *o_start, *o_end, *prev_ext;
478 478 struct ext4_extent new_ext, start_ext, end_ext;
479 479 ext4_lblk_t new_ext_end;
480   - ext4_fsblk_t new_phys_end;
481 480 int oext_alen, new_ext_alen, end_ext_alen;
482 481 int depth = ext_depth(orig_inode);
483 482 int ret;
... ... @@ -491,7 +490,6 @@
491 490 new_ext.ee_len = dext->ee_len;
492 491 new_ext_alen = ext4_ext_get_actual_len(&new_ext);
493 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 495 * Case: original extent is first
... ... @@ -932,7 +930,7 @@
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 935 * @orig_inode: original inode
938 936 * @donor_inode: donor inode