Skip to content

Commit 6036165

Browse files
committed
perf beauty: Sync linux/mount.h copy with the kernel sources
To pick the changes from: 9b8a0ba ("mount: add OPEN_TREE_NAMESPACE") 0e50322 ("statmount: accept fd as a parameter") That doesn't change anything in tools this time as nothing that is harvested by the beauty scripts got changed: $ ls -1 tools/perf/trace/beauty/*mount*sh tools/perf/trace/beauty/fsmount.sh tools/perf/trace/beauty/mount_flags.sh tools/perf/trace/beauty/move_mount_flags.sh $ This addresses this perf build warning. Warning: Kernel ABI header differences: diff -u tools/include/uapi/linux/mount.h include/uapi/linux/mount.h Please see tools/include/uapi/README for further details. Cc: Christian Brauner <brauner@kernel.org> Cc: Bhavik Sachdev <b.sachdev1904@gmail.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 30f998c commit 6036165

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

  • tools/perf/trace/beauty/include/uapi/linux

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
/*
6262
* open_tree() flags.
6363
*/
64-
#define OPEN_TREE_CLONE 1 /* Clone the target tree and attach the clone */
64+
#define OPEN_TREE_CLONE (1 << 0) /* Clone the target tree and attach the clone */
65+
#define OPEN_TREE_NAMESPACE (1 << 1) /* Clone the target tree into a new mount namespace */
6566
#define OPEN_TREE_CLOEXEC O_CLOEXEC /* Close the file on execve() */
6667

6768
/*
@@ -197,7 +198,10 @@ struct statmount {
197198
*/
198199
struct mnt_id_req {
199200
__u32 size;
200-
__u32 mnt_ns_fd;
201+
union {
202+
__u32 mnt_ns_fd;
203+
__u32 mnt_fd;
204+
};
201205
__u64 mnt_id;
202206
__u64 param;
203207
__u64 mnt_ns_id;
@@ -232,4 +236,9 @@ struct mnt_id_req {
232236
#define LSMT_ROOT 0xffffffffffffffff /* root mount */
233237
#define LISTMOUNT_REVERSE (1 << 0) /* List later mounts first */
234238

239+
/*
240+
* @flag bits for statmount(2)
241+
*/
242+
#define STATMOUNT_BY_FD 0x00000001U /* want mountinfo for given fd */
243+
235244
#endif /* _UAPI_LINUX_MOUNT_H */

0 commit comments

Comments
 (0)