Skip to content

Commit 02116fc

Browse files
committed
tools headers: Sync uapi/linux/mount.h with the kernel sources
To pick up the changes in this cset: aefff51 statmount: retrieve security mount options 2f4d450 statmount: add flag to retrieve unescaped options 4401054 fs: add the ability for statmount() to report the sb_source ed9d95f fs: add the ability for statmount() to report the fs_subtype This addresses these perf build warnings: Warning: Kernel ABI header differences: diff -u tools/perf/trace/beauty/include/uapi/linux/mount.h include/uapi/linux/mount.h Please see tools/include/uapi/README for further details. Reviewed-by: James Clark <james.clark@linaro.org> Cc: Christian Brauner <brauner@kernel.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: linux-fsdevel@vger.kernel.org Link: https://lore.kernel.org/r/20241203035349.1901262-10-namhyung@kernel.org Signed-off-by: Namhyung Kim <namhyung@kernel.org>
1 parent 6d442c6 commit 02116fc

File tree

1 file changed

+12
-2
lines changed
  • tools/perf/trace/beauty/include/uapi/linux

1 file changed

+12
-2
lines changed

tools/perf/trace/beauty/include/uapi/linux/mount.h

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ struct mount_attr {
154154
*/
155155
struct statmount {
156156
__u32 size; /* Total size, including strings */
157-
__u32 mnt_opts; /* [str] Mount options of the mount */
157+
__u32 mnt_opts; /* [str] Options (comma separated, escaped) */
158158
__u64 mask; /* What results were written */
159159
__u32 sb_dev_major; /* Device ID */
160160
__u32 sb_dev_minor;
@@ -173,7 +173,13 @@ struct statmount {
173173
__u32 mnt_root; /* [str] Root of mount relative to root of fs */
174174
__u32 mnt_point; /* [str] Mountpoint relative to current root */
175175
__u64 mnt_ns_id; /* ID of the mount namespace */
176-
__u64 __spare2[49];
176+
__u32 fs_subtype; /* [str] Subtype of fs_type (if any) */
177+
__u32 sb_source; /* [str] Source string of the mount */
178+
__u32 opt_num; /* Number of fs options */
179+
__u32 opt_array; /* [str] Array of nul terminated fs options */
180+
__u32 opt_sec_num; /* Number of security options */
181+
__u32 opt_sec_array; /* [str] Array of nul terminated security options */
182+
__u64 __spare2[46];
177183
char str[]; /* Variable size part containing strings */
178184
};
179185

@@ -207,6 +213,10 @@ struct mnt_id_req {
207213
#define STATMOUNT_FS_TYPE 0x00000020U /* Want/got fs_type */
208214
#define STATMOUNT_MNT_NS_ID 0x00000040U /* Want/got mnt_ns_id */
209215
#define STATMOUNT_MNT_OPTS 0x00000080U /* Want/got mnt_opts */
216+
#define STATMOUNT_FS_SUBTYPE 0x00000100U /* Want/got fs_subtype */
217+
#define STATMOUNT_SB_SOURCE 0x00000200U /* Want/got sb_source */
218+
#define STATMOUNT_OPT_ARRAY 0x00000400U /* Want/got opt_... */
219+
#define STATMOUNT_OPT_SEC_ARRAY 0x00000800U /* Want/got opt_sec... */
210220

211221
/*
212222
* Special @mnt_id values that can be passed to listmount

0 commit comments

Comments
 (0)