Message ID | 20200310203112.27346-1-adhemerval.zanella@linaro.org |
---|---|
State | New |
Headers | show |
Series | [COMMITTED] mips: Fix wrong INTERNAL_SYSCALL_ERROR_P check from bc2eb9321e | expand |
* Adhemerval Zanella via Libc-alpha: > Checked on mips64-linux-gnu. > --- > sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c > index cd495a3337..62df5fb26c 100644 > --- a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c > +++ b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c > @@ -43,7 +43,7 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) > struct kernel_stat kst; > > result = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); > - if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result))) > + if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result))) > return __xstat64_conv (vers, &kst, st); > else > { Okay. I should have caught this during review. Perhaps follow the kernel convention and mention that this fixes commit bc2eb9321ec0d17d41596933617b2522c9aa5e0b ("linux: Remove INTERNAL_SYSCALL_DECL") in the commit message?
On 10/03/2020 17:38, Florian Weimer wrote: > * Adhemerval Zanella via Libc-alpha: > >> Checked on mips64-linux-gnu. >> --- >> sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c >> index cd495a3337..62df5fb26c 100644 >> --- a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c >> +++ b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c >> @@ -43,7 +43,7 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) >> struct kernel_stat kst; >> >> result = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); >> - if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result))) >> + if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result))) >> return __xstat64_conv (vers, &kst, st); >> else >> { > > Okay. I should have caught this during review. It was really a long mechanical patch, I should have compare the resulting binaries to get these kind of discrepancies. > > Perhaps follow the kernel convention and mention that this fixes > commit bc2eb9321ec0d17d41596933617b2522c9aa5e0b ("linux: Remove > INTERNAL_SYSCALL_DECL") in the commit message? > I will follow this convention from now on (although I did mentioned that it fixes bc2eb9321e).
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c index cd495a3337..62df5fb26c 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c @@ -43,7 +43,7 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) struct kernel_stat kst; result = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); - if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result))) + if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result))) return __xstat64_conv (vers, &kst, st); else {