From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753642AbdKMQZj (ORCPT ); Mon, 13 Nov 2017 11:25:39 -0500 Received: from imap.thunk.org ([74.207.234.97]:40442 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753421AbdKMQZh (ORCPT ); Mon, 13 Nov 2017 11:25:37 -0500 Date: Mon, 13 Nov 2017 11:25:34 -0500 From: "Theodore Ts'o" To: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org Subject: Re: [GIT PULL] ext4 updates for 4.15 Message-ID: <20171113162534.5xta72w2boeaxk3s@thunk.org> Mail-Followup-To: Theodore Ts'o , torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org References: <20171113031502.f6mctmlmgk5psh77@thunk.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171113031502.f6mctmlmgk5psh77@thunk.org> User-Agent: NeoMutt/20170609 (1.8.3) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I forgot to mention, there's a merge conflict when pulling the ext4 and fscrypt trees. The fixup is relatively straightforward: commit daf886f04e60eda3bbc957e79d81d72965afd947 Merge: a0b3bc855374 232530680290 Author: Theodore Ts'o Date: Sun Nov 12 22:03:15 2017 -0500 Merge tag 'ext4_for_linus' into test Add support for online resizing of file systems with bigalloc. Fix a two data corruption bugs involving DAX, as well as a corruption bug after a crash during a racing fallocate and delayed allocation. Finally, a number of cleanups and optimizations. diff --cc fs/ext4/inode.c index 617c7feced24,9f836e2ec18c..737c43d724fb --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@@ -4587,15 -4640,10 +4640,13 @@@ void ext4_set_inode_flags(struct inode 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,