korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 21:24:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fs/ext4: Narrow scope of DAX check in setflags

Browse Source 
When preventing DAX and journaling on an inode.  Use the effective DAX
check rather than the mount option.

This will be required to support per inode DAX flags.

Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Link: https://lore.kernel.org/r/20200528150003.828793-2-ira.weiny@intel.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Ira Weiny 2020-05-28 07:59:55 -07:00 committed by Theodore Ts'o
parent 2c567af418
commit ff694ab60c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ext4/ioctl.c
View File

@ -393,9 +393,9 @@ flags_err:
if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) { if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
/* /*
* Changes to the journaling mode can cause unsafe changes to * Changes to the journaling mode can cause unsafe changes to
* S_DAX if we are using the DAX mount option. * S_DAX if the inode is DAX
*/ */
if (test_opt(inode->i_sb, DAX)) { if (IS_DAX(inode)) {
err = -EBUSY; err = -EBUSY;
goto flags_out; goto flags_out;
} }