Messages in this thread | | | Date | Tue, 14 Apr 2015 11:34:42 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vfs tree with the xfs tree |
| |
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/xfs/xfs_iops.c between commit 21c3ea18819b ("xfs: unlock i_mutex in xfs_break_layouts") from the xfs tree and commit 5dd3dc06371a ("VFS: normal filesystems (and lustre): d_inode() annotations") from the vfs tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/xfs/xfs_iops.c index 2f1839e4dd1b,54b95232d946..000000000000 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@@ -953,13 -975,9 +953,13 @@@ xfs_vn_setattr uint iolock = XFS_IOLOCK_EXCL; xfs_ilock(ip, iolock); - error = xfs_break_layouts(dentry->d_inode, &iolock, true); - error = xfs_break_layouts(d_inode(dentry), &iolock); - if (!error) ++ error = xfs_break_layouts(d_inode(dentry), &iolock, true); + if (!error) { + xfs_ilock(ip, XFS_MMAPLOCK_EXCL); + iolock |= XFS_MMAPLOCK_EXCL; + error = xfs_setattr_size(ip, iattr); + } xfs_iunlock(ip, iolock); } else { error = xfs_setattr_nonsize(ip, iattr, 0); [unhandled content-type:application/pgp-signature] | |