From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Theodore Ts'o <tytso@mit•edu>
Cc: Mark Brown <broonie@kernel•org>,
Eric Biggers <ebiggers@google•com>,
Ross Zwisler <ross.zwisler@linux•intel.com>,
Jan Kara <jack@suse•cz>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the ext4 tree with the fscrypt tree
Date: Mon, 13 Nov 2017 16:56:21 +1100 [thread overview]
Message-ID: <20171113165621.2ac80941@canb.auug.org.au> (raw)
In-Reply-To: <20171030144804.dkjusjfvl4cvlzoh@sirena.co.uk>
Hi all,
On Mon, 30 Oct 2017 14:48:04 +0000 Mark Brown <broonie@kernel•org> wrote:
>
> Today's linux-next merge of the ext4 tree got a conflict in:
>
> fs/ext4/inode.c
>
> between commit:
>
> 2ee6a576be564272 ("fs, fscrypt: add an S_ENCRYPTED inode flag")
>
> from the fscrypt tree and commit:
>
> d4e50e6d43b2620f ("ext4: add ext4_should_use_dax()")
>
> from the ext4 tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc fs/ext4/inode.c
> index 617c7feced24,9f836e2ec18c..000000000000
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@@ -4572,6 -4610,21 +4610,23 @@@ int ext4_get_inode_loc(struct inode *in
> !ext4_test_inode_state(inode, EXT4_STATE_XATTR));
> }
>
> + static bool ext4_should_use_dax(struct inode *inode)
> + {
> ++ unsigned int flags = EXT4_I(inode)->i_flags;
> ++
> + if (!test_opt(inode->i_sb, DAX))
> + return false;
> + if (!S_ISREG(inode->i_mode))
> + return false;
> + if (ext4_should_journal_data(inode))
> + return false;
> + if (ext4_has_inline_data(inode))
> + return false;
> - if (ext4_encrypted_inode(inode))
> ++ if (flags & EXT4_ENCRYPT_FL)
> + return false;
> + return true;
> + }
> +
> void ext4_set_inode_flags(struct inode *inode)
> {
> unsigned int flags = EXT4_I(inode)->i_flags;
> @@@ -4587,15 -4640,10 +4642,13 @@@
> new_fl |= S_NOATIME;
> if (flags & EXT4_DIRSYNC_FL)
> new_fl |= S_DIRSYNC;
> - if (test_opt(inode->i_sb, DAX) && S_ISREG(inode->i_mode) &&
> - !ext4_should_journal_data(inode) && !ext4_has_inline_data(inode) &&
> - !(flags & EXT4_ENCRYPT_FL))
> + if (ext4_should_use_dax(inode))
> new_fl |= S_DAX;
> + if (flags & EXT4_ENCRYPT_FL)
> + new_fl |= S_ENCRYPTED;
> inode_set_flags(inode, new_fl,
> - S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_DAX);
> + S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_DAX|
> + S_ENCRYPTED);
> }
>
> static blkcnt_t ext4_inode_blocks(struct ext4_inode *raw_inode,
Just a reminder that this conflict still exists.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-11-13 5:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 14:48 linux-next: manual merge of the ext4 tree with the fscrypt tree Mark Brown
2017-11-13 5:56 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-08-18 23:56 Stephen Rothwell
2020-05-22 1:26 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=20171113165621.2ac80941@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=ebiggers@google$(echo .)com \
--cc=jack@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ross.zwisler@linux$(echo .)intel.com \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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