From: "Theodore Ts'o" <tytso@mit.edu>
To: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
linux-ext4@vger.kernel.org
Subject: Re: [GIT PULL] ext4 updates for 4.15
Date: Mon, 13 Nov 2017 11:25:34 -0500 [thread overview]
Message-ID: <20171113162534.5xta72w2boeaxk3s@thunk.org> (raw)
In-Reply-To: <20171113031502.f6mctmlmgk5psh77@thunk.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 <tytso@mit.edu>
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,
next prev parent reply other threads:[~2017-11-13 16:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-13 3:15 Theodore Ts'o
2017-11-13 16:25 ` Theodore Ts'o [this message]
2017-11-14 20:59 ` Linus Torvalds
2017-11-15 0:56 ` Theodore Ts'o
2017-11-15 1:11 ` Linus Torvalds
2018-02-12 10:02 ` ext4 iomap SEEK broken [was: [GIT PULL] ext4 updates for 4.15] Jiri Slaby
2018-02-12 12:14 ` Jiri Slaby
2018-02-12 13:34 ` Jiri Slaby
2018-02-12 13:38 ` Jiri Slaby
2018-02-12 16:10 ` Theodore Ts'o
2018-02-12 20:23 ` Jiri Slaby
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=20171113162534.5xta72w2boeaxk3s@thunk.org \
--to=tytso@mit.edu \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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
all inboxes | Powered by JetHome®