Skip to contentSkip to conversation

xfs: set attributes_mask in xfs_vn_getattr

PATCH In review Darrick J. Wong 1 participant 2 messages Mar 1, 2019 XFS filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs: set attributes_mask in xfs_vn_getattr

From: Darrick J. Wong <[email protected]>

According to the statx documentation we're supposed to set a bit in attributes_mask for every inode flag that the filesystem can support. We don't, so fix this.

---
 fs/xfs/xfs_iops.c |    8 ++++++++
 1 file changed, 8 insertions(+)
fs/xfs/xfs_iops.c +8 -0
index 1efef69a7f1c..74047bd0c1ae 100644
@@ -531,6 +531,10 @@ xfs_vn_getattr(
 		}
 	}
 
+	/*
+	 * Note: If you add another clause to set an attribute flag, please
+	 * update attributes_mask below.
+	 */
 	if (ip->i_d.di_flags & XFS_DIFLAG_IMMUTABLE)
 		stat->attributes |= STATX_ATTR_IMMUTABLE;
 	if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
@@ -538,6 +542,10 @@ xfs_vn_getattr(
 	if (ip->i_d.di_flags & XFS_DIFLAG_NODUMP)
 		stat->attributes |= STATX_ATTR_NODUMP;
 
+	stat->attributes_mask |= (STATX_ATTR_IMMUTABLE |
+				  STATX_ATTR_APPEND |
+				  STATX_ATTR_NODUMP);
+
 	switch (inode->i_mode & S_IFMT) {
 	case S_IFBLK:
 	case S_IFCHR:
#1 lore raw
Quoted 7 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>

According to the statx documentation we're supposed to set a bit in attributes_mask for every inode flag that the filesystem can support. We don't, so fix this.

Heh, self-NAK, Luis posted the same thing a year and a half ago...

Quoted 9 lines
---
 fs/xfs/xfs_iops.c |    8 ++++++++
 1 file changed, 8 insertions(+)
fs/xfs/xfs_iops.c +0 -0
index 1efef69a7f1c..74047bd0c1ae 100644

fs/xfs/xfs_iops.c xfs_vn_getattr( · line 537

Quoted 7 lines
fs/xfs/xfs_iops.c +4 -0
@@ -531,6 +531,10 @@ xfs_vn_getattr(
 		}
 	}
 
+	/*
+	 * Note: If you add another clause to set an attribute flag, please
+	 * update attributes_mask below.
+	 */

...so I'll add this comment to his patch and merge it. Will post xfsprogs changes and testcase soon.

--D

Quoted 14 lines
fs/xfs/xfs_iops.c +4 -0
 	if (ip->i_d.di_flags & XFS_DIFLAG_IMMUTABLE)
 		stat->attributes |= STATX_ATTR_IMMUTABLE;
 	if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
@@ -538,6 +542,10 @@ xfs_vn_getattr(
 	if (ip->i_d.di_flags & XFS_DIFLAG_NODUMP)
 		stat->attributes |= STATX_ATTR_NODUMP;
 
+	stat->attributes_mask |= (STATX_ATTR_IMMUTABLE |
+				  STATX_ATTR_APPEND |
+				  STATX_ATTR_NODUMP);
+
 	switch (inode->i_mode & S_IFMT) {
 	case S_IFBLK:
 	case S_IFCHR: