diff options
| author | Linus Torvalds | 2017-04-09 08:26:21 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2017-04-09 08:26:21 -0700 |
| commit | 2a610b8aa8e5bd449ba270e517b0e72295d62c9c (patch) | |
| tree | ae143a294d4dd7203ac725a1dbe24ffe7d934a75 /include/linux | |
| parent | 78d91a75b40fcf6a08506d308abf2413a29b7e30 (diff) | |
| parent | a8e28440016bfb23bec266c4c66eacca6ea2d48b (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull VFS fixes from Al Viro:
"statx followup fixes and a fix for stack-smashing on alpha"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
alpha: fix stack smashing in old_adjtimex(2)
statx: Include a mask for stx_attributes in struct statx
statx: Reserve the top bit of the mask for future struct expansion
xfs: report crtime and attribute flags to statx
ext4: Add statx support
statx: optimize copy of struct statx to userspace
statx: remove incorrect part of vfs_statx() comment
statx: reject unknown flags when using NULL path
Documentation/filesystems: fix documentation for ->getattr()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/stat.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/stat.h b/include/linux/stat.h index c76e524fb34b..64b6b3aece21 100644 --- a/include/linux/stat.h +++ b/include/linux/stat.h @@ -26,6 +26,7 @@ struct kstat { unsigned int nlink; uint32_t blksize; /* Preferred I/O size */ u64 attributes; + u64 attributes_mask; #define KSTAT_ATTR_FS_IOC_FLAGS \ (STATX_ATTR_COMPRESSED | \ STATX_ATTR_IMMUTABLE | \ |