From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>, Ben Myers <bpm@sgi.com>,
David Chinner <david@fromorbit.com>,
xfs@oss.sgi.com
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>
Subject: linux-next: manual merge of the vfs tree with the xfs tree
Date: Mon, 13 Apr 2015 11:57:37 +1000 [thread overview]
Message-ID: <20150413115737.6ec67270@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/xfs/xfs_iops.c between commit e8e9ad42c1f1 ("xfs: take i_mmap_lock
on extent manipulation operations") 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 015d6a366b16,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);
+ error = xfs_break_layouts(d_inode(dentry), &iolock);
- if (!error)
+ 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);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-04-13 1:57 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 1:57 Stephen Rothwell [this message]
2015-04-13 2:12 ` linux-next: manual merge of the vfs tree with the xfs tree Dave Chinner
-- strict thread matches above, loose matches on Subject: below --
2021-04-19 0:49 Stephen Rothwell
2021-04-20 16:40 ` Darrick J. Wong
2021-04-12 2:22 Stephen Rothwell
2021-04-13 15:20 ` Darrick J. Wong
2018-10-31 0:52 Stephen Rothwell
2018-10-31 1:12 ` Dave Chinner
2016-12-11 23:19 Stephen Rothwell
2015-11-10 23:21 Stephen Rothwell
2015-04-14 1:34 Stephen Rothwell
2011-07-18 3:36 Stephen Rothwell
2011-07-19 1:29 ` Dave Chinner
2010-07-26 1:51 Stephen Rothwell
2010-07-26 3:59 ` Dave Chinner
2010-07-26 4:05 ` Stephen Rothwell
2010-07-05 0:02 Stephen Rothwell
2010-07-07 1:48 ` Christoph Hellwig
2010-07-07 3:50 ` Stephen Rothwell
2010-08-04 1:54 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150413115737.6ec67270@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bpm@sgi.com \
--cc=david@fromorbit.com \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).