Skip to content

Commit

Permalink
ext4: fix ext4 mismerge back in January
Browse files Browse the repository at this point in the history
Duplicate caused, AFAICS, by mismerge in
ff9cb1c>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
  • Loading branch information
Al Viro authored and Theodore Ts'o committed Jul 23, 2012
1 parent 3108b54 commit 2547060
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion fs/ext4/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
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)))
Expand Down

0 comments on commit 2547060

Please sign in to comment.