projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 7d777456 GKH |
1 | From eee98b87da36ae78c6867d8ce1943f65a16da648 Mon Sep 17 00:00:00 2001 |
| 2 | From: Akira Fujita <a-fujita@rs.jp.nec.com> | |
| 3 | Date: Sun, 30 May 2010 22:49:37 -0400 | |
| 4 | Subject: ext4: Code cleanup for EXT4_IOC_MOVE_EXT ioctl | |
| 5 | ||
| 6 | commit c437b2733520599a2c6e0dbcdeae611319f84707 upstream (as of v2.6.33-git11) | |
| 7 | ||
| 8 | a) Fix sparse warning in ext4_ioctl() | |
| 9 | b) Remove unneeded variable in mext_leaf_block() | |
| 10 | c) Fix spelling typo in mext_check_arguments() | |
| 11 | ||
| 12 | Signed-off-by: Akira Fujita <a-fujita@rs.jp.nec.com> | |
| 13 | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> | |
| 14 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 15 | --- | |
| 16 | fs/ext4/ioctl.c | 3 ++- | |
| 17 | fs/ext4/move_extent.c | 4 +--- | |
| 18 | 2 files changed, 3 insertions(+), 4 deletions(-) | |
| 19 | ||
| 20 | --- a/fs/ext4/ioctl.c | |
| 21 | +++ b/fs/ext4/ioctl.c | |
| 22 | @@ -258,7 +258,8 @@ setversion_out: | |
| 23 | if (me.moved_len > 0) | |
| 24 | file_remove_suid(donor_filp); | |
| 25 | ||
| 26 | - if (copy_to_user((struct move_extent *)arg, &me, sizeof(me))) | |
| 27 | + if (copy_to_user((struct move_extent __user *)arg, | |
| 28 | + &me, sizeof(me))) | |
| 29 | err = -EFAULT; | |
| 30 | mext_out: | |
| 31 | fput(donor_filp); | |
| 32 | --- a/fs/ext4/move_extent.c | |
| 33 | +++ b/fs/ext4/move_extent.c | |
| 34 | @@ -477,7 +477,6 @@ mext_leaf_block(handle_t *handle, struct | |
| 35 | struct ext4_extent *oext, *o_start, *o_end, *prev_ext; | |
| 36 | struct ext4_extent new_ext, start_ext, end_ext; | |
| 37 | ext4_lblk_t new_ext_end; | |
| 38 | - ext4_fsblk_t new_phys_end; | |
| 39 | int oext_alen, new_ext_alen, end_ext_alen; | |
| 40 | int depth = ext_depth(orig_inode); | |
| 41 | int ret; | |
| 42 | @@ -491,7 +490,6 @@ mext_leaf_block(handle_t *handle, struct | |
| 43 | new_ext.ee_len = dext->ee_len; | |
| 44 | new_ext_alen = ext4_ext_get_actual_len(&new_ext); | |
| 45 | new_ext_end = le32_to_cpu(new_ext.ee_block) + new_ext_alen - 1; | |
| 46 | - new_phys_end = ext_pblock(&new_ext) + new_ext_alen - 1; | |
| 47 | ||
| 48 | /* | |
| 49 | * Case: original extent is first | |
| 50 | @@ -932,7 +930,7 @@ out2: | |
| 51 | } | |
| 52 | ||
| 53 | /** | |
| 54 | - * mext_check_argumants - Check whether move extent can be done | |
| 55 | + * mext_check_arguments - Check whether move extent can be done | |
| 56 | * | |
| 57 | * @orig_inode: original inode | |
| 58 | * @donor_inode: donor inode |