Commit 2dbbb550 authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman

ext4: fix duplicated mnt_drop_write call in EXT4_IOC_MOVE_EXT

commit 331ae496 upstream.

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>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8db5153f
......@@ -261,7 +261,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)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment