Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c437b273 authored by Akira Fujita's avatar Akira Fujita Committed by Theodore Ts'o
Browse files

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: default avatarAkira Fujita <a-fujita@rs.jp.nec.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 7247c0ca

fs/ext4/ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -258,7 +258,8 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		if (me.moved_len > 0)

			file_remove_suid(donor_filp);



		if (copy_to_user((struct move_extent *)arg, &me, sizeof(me)))

		if (copy_to_user((struct move_extent __user *)arg, 

				 &me, sizeof(me)))

			err = -EFAULT;

mext_out:

		fput(donor_filp);

fs/ext4/move_extent.c

+1 −3
Original line number Diff line number Diff line
@@ -477,7 +477,6 @@ mext_leaf_block(handle_t *handle, struct inode *orig_inode, 
	struct ext4_extent *oext, *o_start, *o_end, *prev_ext;

	struct ext4_extent new_ext, start_ext, end_ext;

	ext4_lblk_t new_ext_end;

	ext4_fsblk_t new_phys_end;

	int oext_alen, new_ext_alen, end_ext_alen;

	int depth = ext_depth(orig_inode);

	int ret;
@@ -491,7 +490,6 @@ mext_leaf_block(handle_t *handle, struct inode *orig_inode, 
	new_ext.ee_len = dext->ee_len;

	new_ext_alen = ext4_ext_get_actual_len(&new_ext);

	new_ext_end = le32_to_cpu(new_ext.ee_block) + new_ext_alen - 1;

	new_phys_end = ext_pblock(&new_ext) + new_ext_alen - 1;



	/*

	 * Case: original extent is first
@@ -932,7 +930,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, 
}



/**

 * mext_check_argumants - Check whether move extent can be done

 * mext_check_arguments - Check whether move extent can be done

 *

 * @orig_inode:		original inode

 * @donor_inode:	donor inode