From: ira.weiny@intel.com
To: fstests@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
Eric Sandeen <sandeen@redhat.com>
Cc: Ira Weiny <ira.weiny@intel.com>,
linux-kernel@vger.kernel.org,
"Darrick J. Wong" <darrick.wong@oracle.com>,
Dan Williams <dan.j.williams@intel.com>,
Dave Chinner <david@fromorbit.com>,
"Theodore Y. Ts'o" <tytso@mit.edu>, Jan Kara <jack@suse.cz>,
Jeff Moyer <jmoyer@redhat.com>,
linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org,
linux-fsdevel@vger.kernel.org,
David Howells <dhowells@redhat.com>
Subject: [PATCH V2] common/rc: Fix _check_s_dax()
Date: Wed, 2 Dec 2020 13:46:29 -0800 [thread overview]
Message-ID: <20201202214629.1563760-1-ira.weiny@intel.com> (raw)
In-Reply-To: <20201202214145.1563433-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
There is a conflict with the user visible statx bits 'mount root' and
'dax'. The kernel is changing the dax bit to correct this conflict.[1]
Adjust _check_s_dax() to use the new bit. Because DAX tests do not run
on root mounts, STATX_ATTR_MOUNT_ROOT should always be 0, therefore we
can allow either bit to indicate DAX and cover any kernel which may be
running.
[1] https://lore.kernel.org/lkml/3e28d2c7-fbe5-298a-13ba-dcd8fd504666@redhat.com/
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
Changes for V2:
Fix bad indentation whitespace.
common/rc | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/common/rc b/common/rc
index b5a504e0dcb4..9418f7bc8dab 100644
--- a/common/rc
+++ b/common/rc
@@ -3221,10 +3221,23 @@ _check_s_dax()
local exp_s_dax=$2
local attributes=$($XFS_IO_PROG -c 'statx -r' $target | awk '/stat.attributes / { print $3 }')
- if [ $exp_s_dax -eq 0 ]; then
- (( attributes & 0x2000 )) && echo "$target has unexpected S_DAX flag"
+
+ # The attribute bit value, STATX_ATTR_DAX (0x2000), conflicted with
+ # STATX_ATTR_MOUNT_ROOT. Therefore, STATX_ATTR_DAX was changed to
+ # 0x00200000.
+ #
+ # Because DAX tests do not run on root mounts, STATX_ATTR_MOUNT_ROOT
+ # should always be 0, therefore we can allow either bit to indicate DAX
+ # and cover any kernel which may be running.
+
+ if [ $(( attributes & 0x00200000 )) -ne 0 ] || [ $(( attributes & 0x2000 )) -ne 0 ]; then
+ if [ $exp_s_dax -eq 0 ]; then
+ echo "$target has unexpected S_DAX flag"
+ fi
else
- (( attributes & 0x2000 )) || echo "$target doesn't have expected S_DAX flag"
+ if [ $exp_s_dax -ne 0 ]; then
+ echo "$target doesn't have expected S_DAX flag"
+ fi
fi
}
--
2.28.0.rc0.12.gb6a658bd00c9
next prev parent reply other threads:[~2020-12-02 21:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 21:41 [PATCH] common/rc: Fix _check_s_dax() ira.weiny
2020-12-02 21:46 ` ira.weiny [this message]
2020-12-04 1:45 ` [PATCH V3] " ira.weiny
2020-12-04 9:47 ` Christoph Hellwig
2020-12-03 8:15 ` [PATCH] " Christoph Hellwig
2020-12-03 17:55 ` Eric Sandeen
2020-12-03 18:08 ` Christoph Hellwig
2020-12-04 1:44 ` Ira Weiny
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=20201202214629.1563760-1-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=dan.j.williams@intel.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=dhowells@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=jmoyer@redhat.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@redhat.com \
--cc=tytso@mit.edu \
/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;
as well as URLs for NNTP newsgroup(s).