History

Merge 4.11-rc6 into driver-core-next

We want the fixes in here as well for testing.

Greg Kroah-Hartman committed 9 years ago

Commit 523aa352 parents fd0f50d 39da7c5477 files · +6928 −2826Browse files

Showing the changes to include/uapi/linux (1 of 477 files). Show all

Unified · Split

include/uapi/linux/stat.h+3−2
@@ -114,7 +114,7 @@ struct statx { · 113 unmodified lines
114 __u64 stx_ino; /* Inode number */114 __u64 stx_ino; /* Inode number */
115 __u64 stx_size; /* File size */115 __u64 stx_size; /* File size */
116 __u64 stx_blocks; /* Number of 512-byte blocks allocated */116 __u64 stx_blocks; /* Number of 512-byte blocks allocated */
117 __u64 __spare1[1];117 __u64 stx_attributes_mask; /* Mask to show what's supported in stx_attributes */
118 /* 0x40 */118 /* 0x40 */
119 struct statx_timestamp stx_atime; /* Last access time */119 struct statx_timestamp stx_atime; /* Last access time */
120 struct statx_timestamp stx_btime; /* File creation time */120 struct statx_timestamp stx_btime; /* File creation time */
@@ -152,9 +152,10 @@ struct statx { · 31 unmodified lines
152#define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */152#define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */
153#define STATX_BTIME 0x00000800U /* Want/got stx_btime */153#define STATX_BTIME 0x00000800U /* Want/got stx_btime */
154#define STATX_ALL 0x00000fffU /* All currently supported flags */154#define STATX_ALL 0x00000fffU /* All currently supported flags */
155#define STATX__RESERVED 0x80000000U /* Reserved for future struct statx expansion */
155 156
156/*157/*
157 * Attributes to be found in stx_attributes158 * Attributes to be found in stx_attributes and masked in stx_attributes_mask.
158 *159 *
159 * These give information about the features or the state of a file that might160 * These give information about the features or the state of a file that might
160 * be of use to ordinary userspace programs such as GUIs or ls rather than161 * be of use to ordinary userspace programs such as GUIs or ls rather than