summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2012-07-22 20:27:31 -0400
committerTheodore Ts'o <tytso@mit.edu>2012-07-22 20:27:31 -0400
commit254706056be7e4e161ae9675ead6cd4e269be966 (patch)
tree12bc0bdb34ac8f908b2746dfbc7ada2eefeccd61
parent3108b54bcedde5d952c90460df5bc21efc1e134f (diff)
downloadop-kernel-dev-254706056be7e4e161ae9675ead6cd4e269be966.zip
op-kernel-dev-254706056be7e4e161ae9675ead6cd4e269be966.tar.gz
ext4: fix ext4 mismerge back in January
Duplicate caused, AFAICS, by mismerge in ff9cb1c4eead5e4c292e75cd3170a82d66944101> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: stable@vger.kernel.org
-rw-r--r--fs/ext4/ioctl.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index e34deac..6ec6f9ee 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -268,7 +268,6 @@ group_extend_out:
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)))
OpenPOWER on IntegriCloud