From: koraynilay <koray.fra@gmail.com>
To: Namjae Jeon <linkinjeon@kernel.org>,
Hyunchul Lee <hyc.lee@gmail.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>
Cc: "Chuck Lever" <cel@kernel.org>,
"Jeff Layton" <jlayton@kernel.org>, "Jan Kara" <jack@suse.cz>,
"Darrick J . Wong" <djwong@kernel.org>,
"Andrey Albershteyn" <aalbersh@kernel.org>,
"Amir Goldstein" <amir73il@gmail.com>,
"Pali Rohár" <pali@kernel.org>,
"Lauri Gates" <lauri.gates@gmail.com>,
"Christoph Hellwig" <hch@infradead.org>,
"Dave Chinner" <dgc@kernel.org>,
linux-btrfs@vger.kernel.org, linux-xfs@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
ntfs@lists.linux.dev, linux-nfs@vger.kernel.org,
linux-api@vger.kernel.org, koraynilay <koray.fra@gmail.com>
Subject: [PATCH 3/3] ntfs: switch to the new xflags fileattr API
Date: Sun, 22 Nov 2026 01:08:56 +0100 [thread overview]
Message-ID: <20261122000856.536902-4-koray.fra@gmail.com> (raw)
In-Reply-To: <20261122000856.536902-1-koray.fra@gmail.com>
Switch ntfs_fileattr_[gs]et() from the legacy FS_*_FL flags to the
modern xflags (FS_XFLAG_*) fileattr API with masks.
Introduce FS_XFLAG_COMPR and FS_XFLAG_ENCRYPT and add them to
FS_XFLAG_COMMON (and add FS_COMPR_FL and FS_ENCRYPT_FL to FS_COMMON_FL)
to be used in this API switch.
Assisted-by: Gemini:3.8-flash-high antigravity-cli-1.5.11
Signed-off-by: koraynilay <koray.fra@gmail.com>
---
fs/file_attr.c | 8 +++++
fs/ntfs/file.c | 63 +++++++++++++++++++---------------------
include/linux/fileattr.h | 6 ++--
include/uapi/linux/fs.h | 2 ++
4 files changed, 44 insertions(+), 35 deletions(-)
diff --git a/fs/file_attr.c b/fs/file_attr.c
index 0e16c23368b2..815b8ba50e1f 100644
--- a/fs/file_attr.c
+++ b/fs/file_attr.c
@@ -39,6 +39,10 @@ void fileattr_fill_xflags(struct file_kattr *fa, u32 xflags)
fa->flags |= FS_VERITY_FL;
if (fa->fsx_xflags & FS_XFLAG_CASEFOLD)
fa->flags |= FS_CASEFOLD_FL;
+ if (fa->fsx_xflags & FS_XFLAG_COMPR)
+ fa->flags |= FS_COMPR_FL;
+ if (fa->fsx_xflags & FS_XFLAG_ENCRYPT)
+ fa->flags |= FS_ENCRYPT_FL;
}
EXPORT_SYMBOL(fileattr_fill_xflags);
@@ -71,6 +75,10 @@ void fileattr_fill_flags(struct file_kattr *fa, u32 flags)
fa->fsx_xflags |= FS_XFLAG_VERITY;
if (fa->flags & FS_CASEFOLD_FL)
fa->fsx_xflags |= FS_XFLAG_CASEFOLD;
+ if (fa->flags & FS_COMPR_FL)
+ fa->fsx_xflags |= FS_XFLAG_COMPR;
+ if (fa->flags & FS_ENCRYPT_FL)
+ fa->fsx_xflags |= FS_XFLAG_ENCRYPT;
}
EXPORT_SYMBOL(fileattr_fill_flags);
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 50be49f4c913..fde6fb2fe39c 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -155,31 +155,37 @@ int ntfs_file_release(struct inode *vi, struct file *filp)
* @dentry: dentry to report the flags of
* @fa: filled in with the flags of @dentry
*/
+#define NTFS_RO_XFLAGS (FS_XFLAG_COMPR | FS_XFLAG_ENCRYPT | FS_XFLAG_CASEFOLD)
+#define NTFS_RW_XFLAGS (FS_XFLAG_IMMUTABLE | FS_XFLAG_APPEND | \
+ FS_XFLAG_NOATIME | FS_XFLAG_NODUMP)
int ntfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)
{
struct inode *vi = d_inode(dentry);
struct ntfs_inode *ni = NTFS_I(vi);
- u32 flags = 0;
+ u32 xflags = 0;
if (NVolShutdown(ni->vol))
return -EIO;
if (NInoCompressed(ni) || NInoWofCompressed(ni))
- flags |= FS_COMPR_FL;
+ xflags |= FS_XFLAG_COMPR;
if (NInoEncrypted(ni))
- flags |= FS_ENCRYPT_FL;
+ xflags |= FS_XFLAG_ENCRYPT;
if (vi->i_flags & S_IMMUTABLE)
- flags |= FS_IMMUTABLE_FL;
+ xflags |= FS_XFLAG_IMMUTABLE;
if (vi->i_flags & S_APPEND)
- flags |= FS_APPEND_FL;
+ xflags |= FS_XFLAG_APPEND;
if (vi->i_flags & S_NOATIME)
- flags |= FS_NOATIME_FL;
+ xflags |= FS_XFLAG_NOATIME;
if (ni->linuxflags & NTFS_LINUXFLAGS_NODUMP)
- flags |= FS_NODUMP_FL;
+ xflags |= FS_XFLAG_NODUMP;
if (!NVolCaseSensitive(ni->vol))
- flags |= FS_CASEFOLD_FL;
+ xflags |= FS_XFLAG_CASEFOLD;
- fileattr_fill_flags(fa, flags);
+ fileattr_fill_xflags(fa, xflags);
+ fa->fsx_xflags_ro_mask = NTFS_RO_XFLAGS;
+ fa->fsx_xflags_rw_mask = NTFS_RW_XFLAGS;
+ fa->has_masks = true;
return 0;
}
@@ -207,9 +213,6 @@ int ntfs_fileattr_set(const struct mnt_idmap *idmap, struct dentry *dentry,
{
struct inode *vi = d_inode(dentry);
struct ntfs_inode *ni = NTFS_I(vi);
- u32 allowed = FS_IMMUTABLE_FL | FS_APPEND_FL | FS_NODUMP_FL |
- FS_NOATIME_FL;
- u32 readonly = 0;
u32 linuxflags = ni->linuxflags & ~NTFS_LINUXFLAGS_MASK;
unsigned int new_fl = 0;
bool forced_immutable;
@@ -219,42 +222,36 @@ int ntfs_fileattr_set(const struct mnt_idmap *idmap, struct dentry *dentry,
if (err)
return err;
- if (fileattr_has_fsx(fa))
- return -EOPNOTSUPP;
-
- /* chattr passes the unchanged read-only flags back to us too. */
- if (NInoCompressed(ni) || NInoWofCompressed(ni))
- readonly |= FS_COMPR_FL;
- if (NInoEncrypted(ni))
- readonly |= FS_ENCRYPT_FL;
- if ((fa->flags ^ readonly) & (FS_COMPR_FL | FS_ENCRYPT_FL))
- return -EOPNOTSUPP;
- allowed |= readonly;
-
- /* Case folding is a read-only, mount-wide property. */
- if (!NVolCaseSensitive(ni->vol))
- allowed |= FS_CASEFOLD_FL;
- if (fa->flags & ~allowed)
+ /*
+ * When userspace uses file_[gs]etattr(), VFS already checks and fails
+ * with -EOPNOTSUPP if rw_mask & ro_mask != 0 and rw_mask & ~allowed,
+ * but for FS_IOC_SETFLAGS and FS_IOC_FSSETXATTR VFS can't check for
+ * allowed flags as these ioctls don't support fsx_xflags_{rw,ro}_mask,
+ * so we need to check for unsupported flags anyway.
+ */
+ if (!fa->has_masks &&
+ ((fa->fsx_xflags & ~NTFS_RW_XFLAGS) ||
+ fa->fsx_extsize || fa->fsx_projid || fa->fsx_cowextsize))
return -EOPNOTSUPP;
forced_immutable = ntfs_is_forced_immutable(vi);
- if (!(fa->flags & FS_IMMUTABLE_FL) && forced_immutable)
+ if (!(fa->fsx_xflags & FS_XFLAG_IMMUTABLE) && forced_immutable)
return -EPERM;
- if (fa->flags & FS_IMMUTABLE_FL) {
+ if (fa->fsx_xflags & FS_XFLAG_IMMUTABLE) {
new_fl |= S_IMMUTABLE;
/* Do not persist an immutable bit derived from the mount. */
if (!forced_immutable ||
(ni->linuxflags & NTFS_LINUXFLAGS_IMMUTABLE))
linuxflags |= NTFS_LINUXFLAGS_IMMUTABLE;
}
- if (fa->flags & FS_APPEND_FL) {
+ if (fa->fsx_xflags & FS_XFLAG_APPEND) {
new_fl |= S_APPEND;
linuxflags |= NTFS_LINUXFLAGS_APPEND;
}
- if (fa->flags & FS_NODUMP_FL)
+ if (fa->fsx_xflags & FS_XFLAG_NODUMP)
linuxflags |= NTFS_LINUXFLAGS_NODUMP;
- if (fa->flags & FS_NOATIME_FL) {
+ if (fa->fsx_xflags & FS_XFLAG_NOATIME) {
new_fl |= S_NOATIME;
linuxflags |= NTFS_LINUXFLAGS_NOATIME;
}
diff --git a/include/linux/fileattr.h b/include/linux/fileattr.h
index 4faa40febf11..219e7c8eb601 100644
--- a/include/linux/fileattr.h
+++ b/include/linux/fileattr.h
@@ -7,12 +7,14 @@
#define FS_COMMON_FL \
(FS_SYNC_FL | FS_IMMUTABLE_FL | FS_APPEND_FL | \
FS_NODUMP_FL | FS_NOATIME_FL | FS_DAX_FL | \
- FS_PROJINHERIT_FL | FS_VERITY_FL)
+ FS_PROJINHERIT_FL | FS_VERITY_FL | FS_COMPR_FL | \
+ FS_ENCRYPT_FL)
#define FS_XFLAG_COMMON \
(FS_XFLAG_SYNC | FS_XFLAG_IMMUTABLE | FS_XFLAG_APPEND | \
FS_XFLAG_NODUMP | FS_XFLAG_NOATIME | FS_XFLAG_DAX | \
- FS_XFLAG_PROJINHERIT | FS_XFLAG_VERITY)
+ FS_XFLAG_PROJINHERIT | FS_XFLAG_VERITY | FS_XFLAG_COMPR | \
+ FS_XFLAG_ENCRYPT)
/* Read-only inode flags */
#define FS_XFLAG_RDONLY_MASK \
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h
index e40806b3a69c..09fc7e066485 100644
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
@@ -275,6 +275,8 @@ struct file_attr {
#define FS_XFLAG_CASENONPRESERVING 0x00080000 /* case not preserved */
#define FS_XFLAG_PROJID 0x00100000 /* project ID */
+#define FS_XFLAG_COMPR 0x00200000 /* Compress file */
+#define FS_XFLAG_ENCRYPT 0x00400000 /* Encrypted file */
#define FS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */
/* the read-only stuff doesn't really belong here, but any other place is
--
2.56.0
prev parent reply other threads:[~2026-11-22 0:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-22 0:08 [PATCH 0/3] Add f*_xflags_{rw,ro}_mask flags to the " koraynilay
2026-11-22 0:08 ` [PATCH 1/3] vfs: use goto out on error in vfs_fileattr_set() koraynilay
2026-11-22 0:08 ` [PATCH 2/3] vfs: add xflags mask to fileattr API koraynilay
2026-11-22 0:08 ` koraynilay [this message]
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=20261122000856.536902-4-koray.fra@gmail.com \
--to=koray.fra@gmail.com \
--cc=aalbersh@kernel.org \
--cc=amir73il@gmail.com \
--cc=brauner@kernel.org \
--cc=cel@kernel.org \
--cc=dgc@kernel.org \
--cc=djwong@kernel.org \
--cc=hch@infradead.org \
--cc=hyc.lee@gmail.com \
--cc=jack@suse.cz \
--cc=jlayton@kernel.org \
--cc=lauri.gates@gmail.com \
--cc=linkinjeon@kernel.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=ntfs@lists.linux.dev \
--cc=pali@kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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®