Hi Stephen,
On Tue 10-01-12 12:22:15, Stephen Rothwell wrote:
> Today's linux-next merge of the ext3 tree got a conflict in
> fs/ext2/ioctl.c between commit 2a79f17e4a64 ("vfs: mnt_drop_write_file
> ()") from Linus' tree and commit 6e85201ff4f4 ("ext2: protect inode
> changes in the SETVERSION and SETFLAGS ioctls") from the ext3 tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks. I now rebased my for_next branch on top of Linus's tree and
resolved the conflict so things should be OK from tomorrow.
Honza
> diff --cc fs/ext2/ioctl.c
> index 1089f76,b7f931f..0000000
> --- a/fs/ext2/ioctl.c
> +++ b/fs/ext2/ioctl.c
> @@@ -80,28 -80,38 +80,38 @@@ long ext2_ioctl(struct file *filp, unsi
>
> ext2_set_inode_flags(inode);
> inode->i_ctime = CURRENT_TIME_SEC;
> + mutex_unlock(&inode->i_mutex);
> +
> mark_inode_dirty(inode);
> setflags_out:
> - mnt_drop_write(filp->f_path.mnt);
> + mnt_drop_write_file(filp);
> return ret;
> }
> case EXT2_IOC_GETVERSION:
> return put_user(inode->i_generation, (int __user *) arg);
> - case EXT2_IOC_SETVERSION:
> + case EXT2_IOC_SETVERSION: {
> + __u32 generation;
> +
> if (!inode_owner_or_capable(inode))
> return -EPERM;
> - ret = mnt_want_write(filp->f_path.mnt);
> + ret = mnt_want_write_file(filp);
> if (ret)
> return ret;
> - if (get_user(inode->i_generation, (int __user *) arg)) {
> + if (get_user(generation, (int __user *) arg)) {
> ret = -EFAULT;
> - } else {
> - inode->i_ctime = CURRENT_TIME_SEC;
> - mark_inode_dirty(inode);
> + goto setversion_out;
> }
> +
> + mutex_lock(&inode->i_mutex);
> + inode->i_ctime = CURRENT_TIME_SEC;
> + inode->i_generation = generation;
> + mutex_unlock(&inode->i_mutex);
> +
> + mark_inode_dirty(inode);
> + setversion_out:
> - mnt_drop_write(filp->f_path.mnt);
> + mnt_drop_write_file(filp);
> return ret;
> + }
> case EXT2_IOC_GETRSVSZ:
> if (test_opt(inode->i_sb, RESERVATION)
> && S_ISREG(inode->i_mode)
--
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
