Messages in this thread | | | Date | Wed, 21 Dec 2011 11:18:01 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vfs tree with the ext4 tree |
| |
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/ext4/ioctl.c between commit 5e8af306ef80 ("ext4: fix potential deadlock with setuid files and EXT4_IOC_MOVE_EXT") from theext4 tree and commit 99b4f71273d9 ("vfs: mnt_drop_write_file()") from the vfs tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/ext4/ioctl.c index ff1aab7,d37b3bb..0000000 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@@ -246,7 -246,9 +246,7 @@@ setversion_out err = ext4_move_extents(filp, donor_filp, me.orig_start, me.donor_start, me.len, &me.moved_len); - mnt_drop_write(filp->f_path.mnt); + mnt_drop_write_file(filp); - if (me.moved_len > 0) - file_remove_suid(donor_filp); if (copy_to_user((struct move_extent __user *)arg, &me, sizeof(me))) [unhandled content-type:application/pgp-signature] | |