projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3108b54
)
ext4: fix ext4 mismerge back in January
author
Al Viro
<viro@ZenIV.linux.org.uk>
Mon, 23 Jul 2012 00:27:31 +0000
(20:27 -0400)
committer
Theodore Ts'o
<tytso@mit.edu>
Mon, 23 Jul 2012 00:27:31 +0000
(20:27 -0400)
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
fs/ext4/ioctl.c
patch
|
blob
|
blame
|
history
diff --git
a/fs/ext4/ioctl.c
b/fs/ext4/ioctl.c
index e34deac3f3663ee3fdaf7d19b44acf5eab45d6ca..6ec6f9ee2fec9099c87f523bbf69614eed789050 100644
(file)
--- 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)))