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

Commit 331ae496 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

ext4: fix duplicated mnt_drop_write call in EXT4_IOC_MOVE_EXT 



Caused, AFAICS, by mismerge in commit ff9cb1c4 ("Merge branch
'for_linus' into for_linus_merged")

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org  # 3.3+
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent de74646c

fs/ext4/ioctl.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -268,7 +268,6 @@ group_extend_out: 
		err = ext4_move_extents(filp, donor_filp, me.orig_start,

		err = ext4_move_extents(filp, donor_filp, me.orig_start,

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

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

		mnt_drop_write_file(filp);

		mnt_drop_write_file(filp);

		mnt_drop_write(filp->f_path.mnt);





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

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

				 &me, sizeof(me)))

				 &me, sizeof(me)))