Re: [PATCH 3/3] ntfs: switch to the new xflags fileattr API
From: liubaolin
Date: Sun Nov 22 2026 - 07:50:57 EST
在 2026/11/22 08:08, koraynilay 写道:
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@xxxxxxxxx>
---
fs/file_attr.c | 8 +++++
fs/ntfs/file.c | 63 +++++++++++++++++++---------------------
include/linux/fileattr.h | 6 ++--
include/uapi/linux/fs.h | 2 ++
Hi koraynilay,
One suggestion on the patch split: would it make sense to put the
new COMPR/ENCRYPT xflags and their VFS handling in a separate patch
before the NTFS conversion?
The changes to include/uapi/linux/fs.h, include/linux/fileattr.h
and fs/file_attr.c introduce generic fileattr support, and the
COMMON mask changes also affect other filesystems.
Keeping those changes together in a VFS patch would make the API
and compatibility aspects easier to review.
The following NTFS patch could then focus on using the new flags while preserving the existing NTFS behaviour.
Thanks,
Baolin.
4 files changed, 44 insertions(+), 35 deletions(-)Hi koraynilay,
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)
There is another case worth keeping in mind when replacing this check:
fileattr_fill_flags() only translates a subset of FS_*_FL bits,
so some unsupported flags will not appear in fsx_xflags.
For example, a direct SETFLAGS request containing only FS_NOCOW_FL produces fsx_xflags == 0. On a normal file on a case-sensitive mount,
the new check would accept that request.
If the file already has persistent NODUMP set, the request would also
clear it, since the setter rebuilds linuxflags without NODUMP and writes
it back to the EA. The current code rejects the request and leaves the
existing attributes unchanged.
Would it be possible to keep validating fa->flags when flags_valid is
set, in addition to the xflags check?
Thanks,
Baolin.
+ /*
+ * 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;
Hi koraynilay,
Could we keep the existing handling of read-only attributes
for legacy SETFLAGS callers here?
On a case-insensitive NTFS mount, the VFS carries over FS_XFLAG_CASEFOLD from the current attributes, since it is not in FS_XFLAG_COMMON.
This check would then reject it because CASEFOLD is not in NTFS_RW_XFLAGS, so even chattr +d would fail with EOPNOTSUPP.
The unchanged COMPR/ENCRYPT bits that chattr reads with GETFLAGS and
passes back with SETFLAGS would also be rejected on compressed/encrypted files.
Allowing those existing read-only attributes to be passed back unchanged would let users continue setting and clearing the persistent flags through chattr,as they can today.
Thanks,
Baolin.
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