From 5046a84d82cd8125c981680d449f4d8c7ea5deb8 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sat, 16 Apr 2011 13:51:08 +0200 Subject: umount: make umount2 depend on UCLIBC_LINUX_SPECIFIC Add hidden umount2 to be used in umount eventually. Rework umount to either use directly umount2 syscall or function. docs say, that mount and umount are also Linux specific Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- libc/sysdeps/linux/common/umount.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'libc/sysdeps/linux/common/umount.c') diff --git a/libc/sysdeps/linux/common/umount.c b/libc/sysdeps/linux/common/umount.c index a084d29bd..916c6c815 100644 --- a/libc/sysdeps/linux/common/umount.c +++ b/libc/sysdeps/linux/common/umount.c @@ -9,24 +9,15 @@ #include -#if defined __USE_GNU #include - -/* arch provides umount() syscall */ #ifdef __NR_umount - _syscall1(int, umount, const char *, specialfile) - -/* arch provides umount2() syscall */ #elif defined __NR_umount2 - -# define __NR___syscall_umount2 __NR_umount2 -static __inline__ _syscall2(int, __syscall_umount2, const char *, special_file, int, flags) - +# ifndef __UCLIBC_LINUX_SPECIFIC__ +static __always_inline _syscall2(int, umount2, const char *, special_file, int, flags) +# endif int umount(const char *special_file) { - return (__syscall_umount2(special_file, 0)); + return umount2(special_file, 0); } - -#endif #endif -- cgit v1.2.3