Commit 72d1249e authored by Eric Sandeen's avatar Eric Sandeen Committed by Linus Torvalds
Browse files

uapi: fix statx attribute value overlap for DAX & MOUNT_ROOT 

STATX_ATTR_MOUNT_ROOT and STATX_ATTR_DAX got merged with the same value,
so one of them needs fixing.  Move STATX_ATTR_DAX.

While we're in here, clarify the value-matching scheme for some of the
attributes, and explain why the value for DAX does not match.

Fixes: 80340fe3 ("statx: add mount_root")
Fixes: 712b2698 ("fs/stat: Define DAX statx attribute")
Link: https://lore.kernel.org/linux-fsdevel/7027520f-7c79-087e-1d00-743bdefa1a1e@redhat.com/
Link: https://lore.kernel.org/lkml/20201202214629.1563760-1-ira.weiny@intel.com/


Reported-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Cc: <stable@vger.kernel.org> # 5.8
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 062c9cdf

include/uapi/linux/stat.h

+6 −3
Original line number Diff line number Diff line
@@ -171,9 +171,12 @@ struct statx { 
 * be of use to ordinary userspace programs such as GUIs or ls rather than

 * specialised tools.

 *

 * Note that the flags marked [I] correspond to generic FS_IOC_FLAGS

 * Note that the flags marked [I] correspond to the FS_IOC_SETFLAGS flags

 * semantically.  Where possible, the numerical value is picked to correspond

 * also.

 * also.  Note that the DAX attribute indicates that the file is in the CPU

 * direct access state.  It does not correspond to the per-inode flag that

 * some filesystems support.

 *

 */

#define STATX_ATTR_COMPRESSED		0x00000004 /* [I] File is compressed by the fs */

#define STATX_ATTR_IMMUTABLE		0x00000010 /* [I] File is marked immutable */
@@ -183,7 +186,7 @@ struct statx { 
#define STATX_ATTR_AUTOMOUNT		0x00001000 /* Dir: Automount trigger */

#define STATX_ATTR_MOUNT_ROOT		0x00002000 /* Root of a mount */

#define STATX_ATTR_VERITY		0x00100000 /* [I] Verity protected file */

#define STATX_ATTR_DAX			0x00002000 /* [I] File is DAX */

#define STATX_ATTR_DAX			0x00200000 /* File is currently in DAX state */





#endif /* _UAPI_LINUX_STAT_H */