Skip to content

Commit ec050f2

Browse files
amir73ilbrauner
authored andcommitted
selftests/mount_settattr: remove duplicate syscall definitions
Which are already defined in wrappers.h. For now, the syscall defintions of mount_settattr() itself remain in the test, which is the only test to use them. Signed-off-by: Amir Goldstein <[email protected]> Link: https://lore.kernel.org/[email protected] Reviewed-by: Christian Brauner <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent ef058fc commit ec050f2

File tree

1 file changed

+0
-52
lines changed

1 file changed

+0
-52
lines changed

tools/testing/selftests/mount_setattr/mount_setattr_test.c

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -107,46 +107,6 @@
107107
#endif
108108
#endif
109109

110-
#ifndef __NR_open_tree
111-
#if defined __alpha__
112-
#define __NR_open_tree 538
113-
#elif defined _MIPS_SIM
114-
#if _MIPS_SIM == _MIPS_SIM_ABI32 /* o32 */
115-
#define __NR_open_tree 4428
116-
#endif
117-
#if _MIPS_SIM == _MIPS_SIM_NABI32 /* n32 */
118-
#define __NR_open_tree 6428
119-
#endif
120-
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
121-
#define __NR_open_tree 5428
122-
#endif
123-
#elif defined __ia64__
124-
#define __NR_open_tree (428 + 1024)
125-
#else
126-
#define __NR_open_tree 428
127-
#endif
128-
#endif
129-
130-
#ifndef __NR_move_mount
131-
#if defined __alpha__
132-
#define __NR_move_mount 539
133-
#elif defined _MIPS_SIM
134-
#if _MIPS_SIM == _MIPS_SIM_ABI32 /* o32 */
135-
#define __NR_move_mount 4429
136-
#endif
137-
#if _MIPS_SIM == _MIPS_SIM_NABI32 /* n32 */
138-
#define __NR_move_mount 6429
139-
#endif
140-
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
141-
#define __NR_move_mount 5429
142-
#endif
143-
#elif defined __ia64__
144-
#define __NR_move_mount (428 + 1024)
145-
#else
146-
#define __NR_move_mount 429
147-
#endif
148-
#endif
149-
150110
#ifndef MOUNT_ATTR_IDMAP
151111
#define MOUNT_ATTR_IDMAP 0x00100000
152112
#endif
@@ -161,18 +121,6 @@ static inline int sys_mount_setattr(int dfd, const char *path, unsigned int flag
161121
return syscall(__NR_mount_setattr, dfd, path, flags, attr, size);
162122
}
163123

164-
#ifndef OPEN_TREE_CLONE
165-
#define OPEN_TREE_CLONE 1
166-
#endif
167-
168-
#ifndef OPEN_TREE_CLOEXEC
169-
#define OPEN_TREE_CLOEXEC O_CLOEXEC
170-
#endif
171-
172-
#ifndef AT_RECURSIVE
173-
#define AT_RECURSIVE 0x8000 /* Apply to the entire subtree */
174-
#endif
175-
176124
static ssize_t write_nointr(int fd, const void *buf, size_t count)
177125
{
178126
ssize_t ret;

0 commit comments

Comments
 (0)