summaryrefslogtreecommitdiff
path: root/fs/ext4
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2012-07-18 09:31:36 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-29 08:04:19 -0700
commit2dbbb550c56cbaf9d8353f4546aab9a88786d279 (patch)
tree957ee7907c4d15769c4915e595e3a994202621f8 /fs/ext4
parent8db5153f9dca89afbeebe0b077e7cc1e5827e07a (diff)
downloadlinux-3.10-2dbbb550c56cbaf9d8353f4546aab9a88786d279.tar.gz
linux-3.10-2dbbb550c56cbaf9d8353f4546aab9a88786d279.tar.bz2
linux-3.10-2dbbb550c56cbaf9d8353f4546aab9a88786d279.zip
ext4: fix duplicated mnt_drop_write call in EXT4_IOC_MOVE_EXT
commit 331ae4962b975246944ea039697a8f1cadce42bb upstream. Caused, AFAICS, by mismerge in commit ff9cb1c4eead ("Merge branch 'for_linus' into for_linus_merged") Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ext4')
-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 1365903a514..9727522e271 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -261,7 +261,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)))