From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 5B9181F5AE for ; Fri, 24 Jul 2020 10:44:15 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 683FF388E80B; Fri, 24 Jul 2020 10:44:14 +0000 (GMT) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by sourceware.org (Postfix) with ESMTPS id 3D6653857C61 for ; Fri, 24 Jul 2020 10:44:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3D6653857C61 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=lukma@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4BCm620yGXz1qrFy; Fri, 24 Jul 2020 12:44:10 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4BCm620fsgz1qy6P; Fri, 24 Jul 2020 12:44:10 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id Z4pSMOBk6mjz; Fri, 24 Jul 2020 12:44:06 +0200 (CEST) X-Auth-Info: vBYoi01wVc2WBlbM1wsDUZYdtFFnwHmivk5cf6Zl3fI= Received: from jawa (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Fri, 24 Jul 2020 12:44:06 +0200 (CEST) Date: Fri, 24 Jul 2020 12:43:59 +0200 From: Lukasz Majewski To: Adhemerval Zanella Subject: Re: [PATCH 16/16] linux: Move xmknoda{at} to compat symbols Message-ID: <20200724124359.0602f9cf@jawa> In-Reply-To: <20200723194641.1949404-17-adhemerval.zanella@linaro.org> References: <20200723194641.1949404-1-adhemerval.zanella@linaro.org> <20200723194641.1949404-17-adhemerval.zanella@linaro.org> Organization: denx.de X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/u.efORxmxpSa_ZY5K=Spjj."; protocol="application/pgp-signature" X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Francis , libc-alpha@sourceware.org Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" --Sig_/u.efORxmxpSa_ZY5K=Spjj. Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Thu, 23 Jul 2020 16:46:41 -0300 Adhemerval Zanella wrote: > It also decouple mknod{at} from xmknod{at}. >=20 > Checked with a build for all affected Linux ABIs. I checked also > on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Lukasz Majewski > --- > include/sys/stat.h | 6 +++-- > sysdeps/mach/hurd/xmknod.c | 1 - > sysdeps/mach/hurd/xmknodat.c | 2 -- > sysdeps/unix/sysv/linux/mknod.c | 28 ++++++++++++++++++++ > sysdeps/unix/sysv/linux/mknodat.c | 41 > ++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/xmknod.c | > 20 +++++---------- sysdeps/unix/sysv/linux/xmknodat.c | 23 > +++++------------ 7 files changed, 86 insertions(+), 35 deletions(-) > create mode 100644 sysdeps/unix/sysv/linux/mknod.c > create mode 100644 sysdeps/unix/sysv/linux/mknodat.c >=20 > diff --git a/include/sys/stat.h b/include/sys/stat.h > index 87d4a5ec4f..da8b14fee0 100644 > --- a/include/sys/stat.h > +++ b/include/sys/stat.h > @@ -84,6 +84,8 @@ extern __mode_t __umask (__mode_t __mask); > extern int __mkdir (const char *__path, __mode_t __mode); > libc_hidden_proto (__mkdir) > =20 > +extern int __mknodat_common (int fd, const char *, __mode_t, __dev_t > *) > + attribute_hidden; > extern int __mknodat (int fd, const char *path, mode_t mode, dev_t > dev); libc_hidden_proto (__mknodat); > extern int __mknod (const char *__path, > @@ -92,10 +94,8 @@ libc_hidden_proto (__mknod); > =20 > extern int __xmknod (int __ver, const char *__path, __mode_t __mode, > __dev_t *__dev); > -libc_hidden_proto (__xmknod) > extern int __xmknodat (int __ver, int __fd, const char *__path, > __mode_t __mode, __dev_t *__dev); > -libc_hidden_proto (__xmknodat) > =20 > int __fxstat (int __ver, int __fildes, struct stat *__stat_buf); > int __xstat (int __ver, const char *__filename, > @@ -121,6 +121,8 @@ hidden_proto (__xstat64); > hidden_proto (__lxstat64); > hidden_proto (__fxstatat64); > # endif > +libc_hidden_proto (__xmknod) > +libc_hidden_proto (__xmknodat) > # define stat(fname, buf) __xstat (_STAT_VER, fname, buf) > # define lstat(fname, buf) __lxstat (_STAT_VER, fname, buf) > # define __lstat(fname, buf) __lxstat (_STAT_VER, fname, buf) > diff --git a/sysdeps/mach/hurd/xmknod.c b/sysdeps/mach/hurd/xmknod.c > index 0ab4f1b719..67e32f518d 100644 > --- a/sysdeps/mach/hurd/xmknod.c > +++ b/sysdeps/mach/hurd/xmknod.c > @@ -30,4 +30,3 @@ __xmknod (int vers, const char *file_name, mode_t > mode, dev_t *dev) { > return __xmknodat (vers, AT_FDCWD, file_name, mode, dev); > } > -libc_hidden_def (__xmknod) > diff --git a/sysdeps/mach/hurd/xmknodat.c > b/sysdeps/mach/hurd/xmknodat.c index 4239d1ea91..0333765ebc 100644 > --- a/sysdeps/mach/hurd/xmknodat.c > +++ b/sysdeps/mach/hurd/xmknodat.c > @@ -116,5 +116,3 @@ __xmknodat (int vers, int fd, const char *path, > mode_t mode, dev_t *dev) return __hurd_fail (err); > return 0; > } > - > -libc_hidden_def (__xmknodat) > diff --git a/sysdeps/unix/sysv/linux/mknod.c > b/sysdeps/unix/sysv/linux/mknod.c new file mode 100644 > index 0000000000..3185726f52 > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/mknod.c > @@ -0,0 +1,28 @@ > +/* Create a special or ordinary file. Linux version. > + Copyright (C) 2020 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be > useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#include > +#include > + > +int > +__mknod (const char *path, mode_t mode, dev_t dev) > +{ > + return __mknodat_common (AT_FDCWD, path, mode, &dev); > +} > +libc_hidden_def (__mknod) > +weak_alias (__mknod, mknod) > diff --git a/sysdeps/unix/sysv/linux/mknodat.c > b/sysdeps/unix/sysv/linux/mknodat.c new file mode 100644 > index 0000000000..d160fe520b > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/mknodat.c > @@ -0,0 +1,41 @@ > +/* Create a special or ordinary file. Linux version. > + Copyright (C) 2020 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be > useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#include > +#include > +#include > + > +int > +__mknodat_common (int fd, const char *path, mode_t mode, dev_t *dev) > +{ > + /* We must convert the value to dev_t type used by the kernel. */ > + unsigned long long int k_dev =3D (*dev) & ((1ULL << 32) - 1); > + if (k_dev !=3D *dev) > + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); > + > + return INLINE_SYSCALL_CALL (mknodat, fd, path, mode, > + (unsigned int) k_dev); > +} > + > +int > +__mknodat (int fd, const char *path, mode_t mode, dev_t dev) > +{ > + return __mknodat_common (fd, path, mode, &dev); > +} > +libc_hidden_def (__mknodat) > +weak_alias (__mknodat, mknodat) > diff --git a/sysdeps/unix/sysv/linux/xmknod.c > b/sysdeps/unix/sysv/linux/xmknod.c index 42809d4c57..2ae384a536 100644 > --- a/sysdeps/unix/sysv/linux/xmknod.c > +++ b/sysdeps/unix/sysv/linux/xmknod.c > @@ -17,29 +17,23 @@ > . */ > =20 > #include > -#include > #include > -#include > +#include > +#include > =20 > +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > /* Create a device file named PATH, with permission and special bits > MODE and device number DEV (which can be constructed from major and > minor device numbers with the `makedev' macro above). */ > int > +attribute_compat_text_section > __xmknod (int vers, const char *path, mode_t mode, dev_t *dev) > { > - unsigned long long int k_dev; > - > if (vers !=3D _MKNOD_VER) > return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); > =20 > - /* We must convert the value to dev_t type used by the kernel. */ > - k_dev =3D (*dev) & ((1ULL << 32) - 1); > - if (k_dev !=3D *dev) > - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); > - > - return INLINE_SYSCALL_CALL (mknodat, AT_FDCWD, path, mode, > - (unsigned int) k_dev); > + return __mknodat_common (AT_FDCWD, path, mode, dev); > } > =20 > -weak_alias (__xmknod, _xmknod) > -libc_hidden_def (__xmknod) > +compat_symbol (libc, __xmknod, __xmknod, GLIBC_2_0); > +#endif > diff --git a/sysdeps/unix/sysv/linux/xmknodat.c > b/sysdeps/unix/sysv/linux/xmknodat.c index 5640a499aa..11b52a29b2 > 100644 --- a/sysdeps/unix/sysv/linux/xmknodat.c > +++ b/sysdeps/unix/sysv/linux/xmknodat.c > @@ -15,18 +15,11 @@ > License along with the GNU C Library; if not, see > . */ > =20 > -#include > -#include > -#include > -#include > -#include > #include > -#include > - > -#include > -#include > - > +#include > +#include > =20 > +#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) > /* Create a device file named PATH relative to FD, with permission > and special bits MODE and device number DEV (which can be constructed > from major and minor device numbers with the `makedev' macro > above). */ @@ -36,12 +29,8 @@ __xmknodat (int vers, int fd, const > char *file, mode_t mode, dev_t *dev) if (vers !=3D _MKNOD_VER) > return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); > =20 > - /* We must convert the value to dev_t type used by the kernel. */ > - unsigned long long int k_dev =3D (*dev) & ((1ULL << 32) - 1); > - if (k_dev !=3D *dev) > - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); > - > - return INLINE_SYSCALL (mknodat, 4, fd, file, mode, (unsigned int) > k_dev); > + return __mknodat_common (fd, file, mode, dev); > } > =20 > -libc_hidden_def (__xmknodat) > +compat_symbol (libc, __xmknodat, __xmknodat, GLIBC_2_4); > +#endif Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de --Sig_/u.efORxmxpSa_ZY5K=Spjj. Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEgAyFJ+N6uu6+XupJAR8vZIA0zr0FAl8au28ACgkQAR8vZIA0 zr0f4Qf6A3TkcsG4b0TCVM7JNK5tjUSH1a1tmdahXLd8sQgnEe0DEJjju9QfLqvZ jP6QG6D4CF9UI4zdKMecCV/MS6xQvookIshjOyay8tMp1NpPE74StT/yrRkQLioh v0G5oWxTZ1tSlnDK/oZ67u3Vg+rEfcKX59aXHS2fj3Cbq3zMGP6WXvr0umDvQtZH ljCwAbheake0PZIolFFxWdJbj/RK7vVbcPcRudiS9WefQIWVG+1KonEtiilv+fck 9Udgqd0Faw1Aat0MzPaEwwWDCpZLAUF7rwKyu2M1Tk1dzZrKXQ+DD6RvwZ3L79v6 lM2fAJCfxqSRH4NalMU7NR4maKH+7Q== =oLD7 -----END PGP SIGNATURE----- --Sig_/u.efORxmxpSa_ZY5K=Spjj.--