From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Jun 2020 16:32:10 +0000 (-0700)
Subject: Merge tag 'ext4-for-linus-5.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3be20b6fc13abff843901fcd7cd9c7a3a7f95b90;p=linux.git

Merge tag 'ext4-for-linus-5.8-rc1-2' of git://git./linux/kernel/git/tytso/ext4

Pull more ext4 updates from Ted Ts'o:
 "This is the second round of ext4 commits for 5.8 merge window [1].

  It includes the per-inode DAX support, which was dependant on the DAX
  infrastructure which came in via the XFS tree, and a number of
  regression and bug fixes; most notably the "BUG: using
  smp_processor_id() in preemptible code in ext4_mb_new_blocks" reported
  by syzkaller"

[1] The pull request actually came in 15 minutes after I had tagged the
    rc1 release. Tssk, tssk, late..   - Linus

* tag 'ext4-for-linus-5.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4, jbd2: ensure panic by fix a race between jbd2 abort and ext4 error handlers
  ext4: support xattr gnu.* namespace for the Hurd
  ext4: mballoc: Use this_cpu_read instead of this_cpu_ptr
  ext4: avoid utf8_strncasecmp() with unstable name
  ext4: stop overwrite the errcode in ext4_setup_super
  ext4: fix partial cluster initialization when splitting extent
  ext4: avoid race conditions when remounting with options that change dax
  Documentation/dax: Update DAX enablement for ext4
  fs/ext4: Introduce DAX inode flag
  fs/ext4: Remove jflag variable
  fs/ext4: Make DAX mount option a tri-state
  fs/ext4: Only change S_DAX on inode load
  fs/ext4: Update ext4_should_use_dax()
  fs/ext4: Change EXT4_MOUNT_DAX to EXT4_MOUNT_DAX_ALWAYS
  fs/ext4: Disallow verity if inode is DAX
  fs/ext4: Narrow scope of DAX check in setflags
---

3be20b6fc13abff843901fcd7cd9c7a3a7f95b90
diff --cc fs/ext4/super.c
index c668f6b42374b,2660a7e47eefa..330957ed1f05c
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@@ -2350,9 -2362,20 +2401,20 @@@ static int _ext4_show_options(struct se
  		SEQ_OPTS_PRINT("max_dir_size_kb=%u", sbi->s_max_dir_size_kb);
  	if (test_opt(sb, DATA_ERR_ABORT))
  		SEQ_OPTS_PUTS("data_err=abort");
 -	if (DUMMY_ENCRYPTION_ENABLED(sbi))
 -		SEQ_OPTS_PUTS("test_dummy_encryption");
 +
 +	fscrypt_show_test_dummy_encryption(seq, sep, sb);
  
+ 	if (test_opt(sb, DAX_ALWAYS)) {
+ 		if (IS_EXT2_SB(sb))
+ 			SEQ_OPTS_PUTS("dax");
+ 		else
+ 			SEQ_OPTS_PUTS("dax=always");
+ 	} else if (test_opt2(sb, DAX_NEVER)) {
+ 		SEQ_OPTS_PUTS("dax=never");
+ 	} else if (test_opt2(sb, DAX_INODE)) {
+ 		SEQ_OPTS_PUTS("dax=inode");
+ 	}
+ 
  	ext4_show_quota_options(seq, sb);
  	return 0;
  }