From: Karel Zak Date: Thu, 9 Jun 2022 10:15:41 +0000 (+0200) Subject: include/mount-api-utils: fix indention X-Git-Tag: v2.39-rc1~334 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e5381cbde19f1f2b40987c3297fcde5358ab104;p=thirdparty%2Futil-linux.git include/mount-api-utils: fix indention Signed-off-by: Karel Zak --- diff --git a/include/mount-api-utils.h b/include/mount-api-utils.h index b461104768..fc8220168b 100644 --- a/include/mount-api-utils.h +++ b/include/mount-api-utils.h @@ -15,118 +15,118 @@ /* Accepted by both open_tree() and mount_setattr(). */ #ifndef AT_RECURSIVE -#define AT_RECURSIVE 0x8000 +# define AT_RECURSIVE 0x8000 #endif #ifndef OPEN_TREE_CLONE -#define OPEN_TREE_CLONE 1 +# define OPEN_TREE_CLONE 1 #endif #ifndef OPEN_TREE_CLOEXEC -#define OPEN_TREE_CLOEXEC O_CLOEXEC +# define OPEN_TREE_CLOEXEC O_CLOEXEC #endif -# ifndef HAVE_OPEN_TREE +#ifndef HAVE_OPEN_TREE static inline int open_tree(int dfd, const char *filename, unsigned int flags) { return syscall(__NR_open_tree, dfd, filename, flags); } -# endif +#endif #ifndef MOVE_MOUNT_F_SYMLINKS -#define MOVE_MOUNT_F_SYMLINKS 0x00000001 /* Follow symlinks on from path */ +# define MOVE_MOUNT_F_SYMLINKS 0x00000001 /* Follow symlinks on from path */ #endif #ifndef MOVE_MOUNT_F_AUTOMOUNTS -#define MOVE_MOUNT_F_AUTOMOUNTS 0x00000002 /* Follow automounts on from path */ +# define MOVE_MOUNT_F_AUTOMOUNTS 0x00000002 /* Follow automounts on from path */ #endif #ifndef MOVE_MOUNT_F_EMPTY_PATH -#define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ +# define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ #endif #ifndef MOVE_MOUNT_T_SYMLINKS -#define MOVE_MOUNT_T_SYMLINKS 0x00000010 /* Follow symlinks on to path */ +# define MOVE_MOUNT_T_SYMLINKS 0x00000010 /* Follow symlinks on to path */ #endif #ifndef MOVE_MOUNT_T_AUTOMOUNTS -#define MOVE_MOUNT_T_AUTOMOUNTS 0x00000020 /* Follow automounts on to path */ +# define MOVE_MOUNT_T_AUTOMOUNTS 0x00000020 /* Follow automounts on to path */ #endif #ifndef MOVE_MOUNT_T_EMPTY_PATH -#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ +# define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ #endif #ifndef MOVE_MOUNT__MASK -#define MOVE_MOUNT__MASK 0x00000077 +# define MOVE_MOUNT__MASK 0x00000077 #endif -# ifndef HAVE_MOVE_MOUNT +#ifndef HAVE_MOVE_MOUNT static inline int move_mount(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, unsigned int flags) { return syscall(__NR_move_mount, from_dfd, from_pathname, to_dfd, to_pathname, flags); } -# endif +#endif #ifndef MOUNT_ATTR_RDONLY -#define MOUNT_ATTR_RDONLY 0x00000001 +# define MOUNT_ATTR_RDONLY 0x00000001 #endif #ifndef MOUNT_ATTR_NOSUID -#define MOUNT_ATTR_NOSUID 0x00000002 +# define MOUNT_ATTR_NOSUID 0x00000002 #endif #ifndef MOUNT_ATTR_NOEXEC -#define MOUNT_ATTR_NOEXEC 0x00000008 +# define MOUNT_ATTR_NOEXEC 0x00000008 #endif #ifndef MOUNT_ATTR_NODIRATIME -#define MOUNT_ATTR_NODIRATIME 0x00000080 +# define MOUNT_ATTR_NODIRATIME 0x00000080 #endif #ifndef MOUNT_ATTR__ATIME -#define MOUNT_ATTR__ATIME 0x00000070 +# define MOUNT_ATTR__ATIME 0x00000070 #endif #ifndef MOUNT_ATTR_RELATIME -#define MOUNT_ATTR_RELATIME 0x00000000 +# define MOUNT_ATTR_RELATIME 0x00000000 #endif #ifndef MOUNT_ATTR_NOATIME -#define MOUNT_ATTR_NOATIME 0x00000010 +# define MOUNT_ATTR_NOATIME 0x00000010 #endif #ifndef MOUNT_ATTR_STRICTATIME -#define MOUNT_ATTR_STRICTATIME 0x00000020 +# define MOUNT_ATTR_STRICTATIME 0x00000020 #endif #ifndef MOUNT_ATTR_IDMAP -#define MOUNT_ATTR_IDMAP 0x00100000 +# define MOUNT_ATTR_IDMAP 0x00100000 #endif -# ifndef HAVE_STRUCT_MOUNT_ATTR -# include +#ifndef HAVE_STRUCT_MOUNT_ATTR +# include struct mount_attr { __u64 attr_set; __u64 attr_clr; __u64 propagation; __u64 userns_fd; }; -# endif +#endif -# ifndef HAVE_MOUNT_SETATTR +#ifndef HAVE_MOUNT_SETATTR static inline int mount_setattr(int dfd, const char *path, unsigned int flags, struct mount_attr *attr, size_t size) { return syscall(__NR_mount_setattr, dfd, path, flags, attr, size); } -# endif +#endif #define UL_HAVE_MOUNT_API 1 -# endif +#endif /* SYS_mount_setattr */ #endif /* __linux__ */ #endif /* UTIL_LINUX_MOUNT_API_UTILS */