From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>,
Fabian Frederick <fabf@skynet.be>
Subject: linux-next: manual merge of the akpm-current tree with the vfs tree
Date: Mon, 13 Apr 2015 20:57:49 +1000 [thread overview]
Message-ID: <20150413205749.0c6dcf74@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 990 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
fs/affs/amigaffs.c between commit 5dd3dc06371a ("VFS: normal
filesystems (and lustre): d_inode() annotations") from the vfs tree and
commit 18da6e382823 ("fs/affs: use AFFS_MOUNT prefix for mount
options") from the akpm-current 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/affs/amigaffs.c
index 40eb5814b98c,5022ac96aa40..000000000000
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@@ -471,8 -471,9 +471,9 @@@ affs_warning(struct super_block *sb, co
bool
affs_nofilenametruncate(const struct dentry *dentry)
{
- struct inode *inode = dentry->d_inode;
+ struct inode *inode = d_inode(dentry);
- return AFFS_SB(inode->i_sb)->s_flags & SF_NO_TRUNCATE;
+
+ return affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_NO_TRUNCATE);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-04-13 10:57 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 10:57 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-06-19 6:36 linux-next: manual merge of the akpm-current tree with the vfs tree Stephen Rothwell
2018-05-29 9:37 Stephen Rothwell
2017-07-10 4:41 Stephen Rothwell
2016-01-11 7:48 Stephen Rothwell
2016-01-11 13:26 ` Vlastimil Babka
2015-12-03 0:18 Mark Brown
2015-06-17 3:24 Michael Ellerman
2015-04-13 11:10 Stephen Rothwell
2015-04-13 11:00 Stephen Rothwell
2015-03-13 5:31 Stephen Rothwell
2015-03-13 5:27 Stephen Rothwell
2013-11-08 7:38 Stephen Rothwell
2013-11-08 18:58 ` Josh Triplett
2013-11-08 7:35 Stephen Rothwell
2013-11-08 7:30 Stephen Rothwell
2013-11-08 12:59 ` Oleg Nesterov
2013-11-08 13:48 ` Oleg Nesterov
2013-02-27 2:00 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=20150413205749.0c6dcf74@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=fabf@skynet.be \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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).