diff options
author | Al Viro <viro@ZenIV.linux.org.uk> | 2012-07-23 02:27:31 +0200 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2012-07-23 02:27:31 +0200 |
commit | 254706056be7e4e161ae9675ead6cd4e269be966 (patch) | |
tree | 12bc0bdb34ac8f908b2746dfbc7ada2eefeccd61 | |
parent | ext4: remove dynamic array size in ext4_chksum() (diff) | |
download | linux-254706056be7e4e161ae9675ead6cd4e269be966.tar.xz linux-254706056be7e4e161ae9675ead6cd4e269be966.zip |
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.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index e34deac3f366..6ec6f9ee2fec 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))) |