Commit 6036165a authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf beauty: Sync linux/mount.h copy with the kernel sources 



To pick the changes from:

  9b8a0ba6 ("mount: add OPEN_TREE_NAMESPACE")
  0e503223 ("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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 30f998c9

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

+11 −2
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ 
/*

 * open_tree() flags.

 */

#define OPEN_TREE_CLONE		1		/* Clone the target tree and attach the clone */

#define OPEN_TREE_CLONE		(1 << 0)	/* Clone the target tree and attach the clone */

#define OPEN_TREE_NAMESPACE	(1 << 1)	/* Clone the target tree into a new mount namespace */

#define OPEN_TREE_CLOEXEC	O_CLOEXEC	/* Close the file on execve() */



/*
@@ -197,7 +198,10 @@ struct statmount { 
 */

struct mnt_id_req {

	__u32 size;

	union {

		__u32 mnt_ns_fd;

		__u32 mnt_fd;

	};

	__u64 mnt_id;

	__u64 param;

	__u64 mnt_ns_id;
@@ -232,4 +236,9 @@ struct mnt_id_req { 
#define LSMT_ROOT		0xffffffffffffffff	/* root mount */

#define LISTMOUNT_REVERSE	(1 << 0) /* List later mounts first */



/*

 * @flag bits for statmount(2)

 */

#define STATMOUNT_BY_FD		0x00000001U	/* want mountinfo for given fd */



#endif /* _UAPI_LINUX_MOUNT_H */