Commit 25470605 authored by Al Viro's avatar Al Viro Committed by Theodore Ts'o
Browse files

ext4: fix ext4 mismerge back in January 



Duplicate caused, AFAICS, by mismerge in
ff9cb1c4>

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
parent 3108b54b

fs/ext4/ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		err = ext4_move_extents(filp, donor_filp, me.orig_start,

					me.donor_start, me.len, &me.moved_len);

		mnt_drop_write_file(filp);

		mnt_drop_write(filp->f_path.mnt);



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

				 &me, sizeof(me)))