Hi all,
On Mon, 30 Oct 2017 14:48:04 +0000 Mark Brown <broo...@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
