diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2012-07-18 10:31:36 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-18 17:59:46 +0200 |
| commit | 331ae4962b975246944ea039697a8f1cadce42bb (patch) | |
| tree | 38c56c8b83e3a6b01d3bfd05bb8edd195094e276 /fs | |
| parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
| download | linux-331ae4962b975246944ea039697a8f1cadce42bb.tar.xz linux-331ae4962b975246944ea039697a8f1cadce42bb.zip | |
ext4: fix duplicated mnt_drop_write call in EXT4_IOC_MOVE_EXT
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>
Cc: stable@vger.kernel.org # 3.3+
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -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))) |