From e5dee2c896f04d88defdfa00282fa83f5f4004d8 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 21 Aug 2015 09:57:15 -0700 Subject: Revert "Add INLINE_SYSCALL_RETURN/INLINE_SYSCALL_ERROR_RETURN" This reverts commit 0c5b8b5941e036dcaac69cecee9f01fdf9218e6e. --- sysdeps/unix/sysv/linux/lxstat.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'sysdeps/unix/sysv/linux/lxstat.c') diff --git a/sysdeps/unix/sysv/linux/lxstat.c b/sysdeps/unix/sysv/linux/lxstat.c index ae3f33cb7f..948665c27a 100644 --- a/sysdeps/unix/sysv/linux/lxstat.c +++ b/sysdeps/unix/sysv/linux/lxstat.c @@ -35,21 +35,20 @@ int __lxstat (int vers, const char *name, struct stat *buf) { if (vers == _STAT_VER_KERNEL) - return INLINE_SYSCALL_ERROR_RETURN (lstat, 2, int, name, - (struct kernel_stat *) buf); + return INLINE_SYSCALL (lstat, 2, name, (struct kernel_stat *) buf); #ifdef STAT_IS_KERNEL_STAT - return INLINE_SYSCALL_ERROR_RETURN (-EINVAL, int, -1) + errno = EINVAL; + return -1; #else struct kernel_stat kbuf; - INTERNAL_SYSCALL_DECL (err); - int result = INTERNAL_SYSCALL (lstat, err, 2, name, &kbuf); - if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result, err))) - return INLINE_SYSCALL_ERROR_RETURN (-INTERNAL_SYSCALL_ERRNO (result, - err), - int, -1) - else - return __xstat_conv (vers, &kbuf, buf); + int result; + + result = INLINE_SYSCALL (lstat, 2, name, &kbuf); + if (result == 0) + result = __xstat_conv (vers, &kbuf, buf); + + return result; #endif } -- cgit v1.2.3