From: Eric Sandeen <sandeen@redhat.com>
To: torvalds@linux-foundation.org,
Miklos Szeredi <mszeredi@redhat.com>,
Ira Weiny <ira.weiny@intel.com>,
David Howells <dhowells@redhat.com>
Cc: linux-fsdevel@vger.kernel.org, linux-man@vger.kernel.org,
linux-kernel@vger.kernel.org, xfs <linux-xfs@vger.kernel.org>,
linux-ext4@vger.kernel.org, Xiaoli Feng <xifeng@redhat.com>
Subject: [PATCH 2/2] statx: move STATX_ATTR_DAX attribute handling to filesystems
Date: Tue, 1 Dec 2020 10:59:36 -0600 [thread overview]
Message-ID: <05a0f4fd-7f62-8fbc-378d-886ccd5b3f11@redhat.com> (raw)
In-Reply-To: <e388f379-cd11-a5d2-db82-aa1aa518a582@redhat.com>
It's a bit odd to set STATX_ATTR_DAX into the statx attributes in the VFS;
while the VFS can detect the current DAX state, it is the filesystem which
actually sets S_DAX on the inode, and the filesystem is the place that
knows whether DAX is something that the "filesystem actually supports" [1]
so that the statx attributes_mask can be properly set.
So, move STATX_ATTR_DAX attribute setting to the individual dax-capable
filesystems, and update the attributes_mask there as well.
[1] 3209f68b3ca4 statx: Include a mask for stx_attributes in struct statx
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
fs/ext2/inode.c | 6 +++++-
fs/ext4/inode.c | 5 ++++-
fs/stat.c | 3 ---
fs/xfs/xfs_iops.c | 5 ++++-
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 11c5c6fe75bb..3550783a6ea0 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1653,11 +1653,15 @@ int ext2_getattr(const struct path *path, struct kstat *stat,
stat->attributes |= STATX_ATTR_IMMUTABLE;
if (flags & EXT2_NODUMP_FL)
stat->attributes |= STATX_ATTR_NODUMP;
+ if (IS_DAX(inode))
+ stat->attributes |= STATX_ATTR_DAX;
+
stat->attributes_mask |= (STATX_ATTR_APPEND |
STATX_ATTR_COMPRESSED |
STATX_ATTR_ENCRYPTED |
STATX_ATTR_IMMUTABLE |
- STATX_ATTR_NODUMP);
+ STATX_ATTR_NODUMP |
+ STATX_ATTR_DAX);
generic_fillattr(inode, stat);
return 0;
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 0d8385aea898..848a0f2b154e 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5550,13 +5550,16 @@ int ext4_getattr(const struct path *path, struct kstat *stat,
stat->attributes |= STATX_ATTR_NODUMP;
if (flags & EXT4_VERITY_FL)
stat->attributes |= STATX_ATTR_VERITY;
+ if (IS_DAX(inode))
+ stat->attributes |= STATX_ATTR_DAX;
stat->attributes_mask |= (STATX_ATTR_APPEND |
STATX_ATTR_COMPRESSED |
STATX_ATTR_ENCRYPTED |
STATX_ATTR_IMMUTABLE |
STATX_ATTR_NODUMP |
- STATX_ATTR_VERITY);
+ STATX_ATTR_VERITY |
+ STATX_ATTR_DAX);
generic_fillattr(inode, stat);
return 0;
diff --git a/fs/stat.c b/fs/stat.c
index dacecdda2e79..5bd90949c69b 100644
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -80,9 +80,6 @@ int vfs_getattr_nosec(const struct path *path, struct kstat *stat,
if (IS_AUTOMOUNT(inode))
stat->attributes |= STATX_ATTR_AUTOMOUNT;
- if (IS_DAX(inode))
- stat->attributes |= STATX_ATTR_DAX;
-
if (inode->i_op->getattr)
return inode->i_op->getattr(path, stat, request_mask,
query_flags);
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 1414ab79eacf..56deda7042fd 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -575,10 +575,13 @@ xfs_vn_getattr(
stat->attributes |= STATX_ATTR_APPEND;
if (ip->i_d.di_flags & XFS_DIFLAG_NODUMP)
stat->attributes |= STATX_ATTR_NODUMP;
+ if (IS_DAX(inode))
+ stat->attributes |= STATX_ATTR_DAX;
stat->attributes_mask |= (STATX_ATTR_IMMUTABLE |
STATX_ATTR_APPEND |
- STATX_ATTR_NODUMP);
+ STATX_ATTR_NODUMP |
+ STATX_ATTR_DAX);
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
--
2.17.0
next prev parent reply other threads:[~2020-12-01 17:01 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 16:54 [PATCH 0/2] statx: Fix DAX attribute collision and handling Eric Sandeen
2020-12-01 16:57 ` [PATCH 1/2] uapi: fix statx attribute value overlap for DAX & MOUNT_ROOT Eric Sandeen
2020-12-01 17:32 ` Darrick J. Wong
2020-12-01 17:44 ` Eric Sandeen
2020-12-01 18:31 ` Andreas Dilger
2020-12-01 18:36 ` Eric Sandeen
2020-12-02 2:16 ` Ira Weiny
2020-12-02 20:42 ` Linus Torvalds
2020-12-03 2:45 ` Ira Weiny
2020-12-03 18:04 ` Linus Torvalds
2020-12-01 16:59 ` Eric Sandeen [this message]
2020-12-01 17:39 ` [PATCH 2/2] statx: move STATX_ATTR_DAX attribute handling to filesystems Darrick J. Wong
2020-12-01 17:53 ` Eric Sandeen
2020-12-01 20:52 ` Dave Chinner
2020-12-01 22:03 ` Eric Sandeen
2020-12-01 22:12 ` Linus Torvalds
2020-12-01 22:26 ` Eric Sandeen
2020-12-02 2:29 ` Ira Weiny
2020-12-02 8:03 ` Christoph Hellwig
2020-12-01 20:04 ` Linus Torvalds
2020-12-01 20:50 ` Eric Sandeen
2020-12-01 21:04 ` David Howells
2020-12-01 22:09 ` Linus Torvalds
2020-12-02 0:11 ` Eric Sandeen
2020-12-01 17:18 ` [PATCH 1/2] uapi: fix statx attribute value overlap for DAX & MOUNT_ROOT David Howells
2020-12-01 17:20 ` [PATCH 2/2] statx: move STATX_ATTR_DAX attribute handling to filesystems David Howells
2020-12-01 17:28 ` David Howells
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=05a0f4fd-7f62-8fbc-378d-886ccd5b3f11@redhat.com \
--to=sandeen@redhat.com \
--cc=dhowells@redhat.com \
--cc=ira.weiny@intel.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-man@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=mszeredi@redhat.com \
--cc=torvalds@linux-foundation.org \
--cc=xifeng@redhat.com \
/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).