From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) by sourceware.org (Postfix) with ESMTPS id B99C53858010 for ; Mon, 28 Dec 2020 19:10:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B99C53858010 Received: by mail-qv1-xf36.google.com with SMTP id 4so5396803qvh.1 for ; Mon, 28 Dec 2020 11:10:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=jEaomxSRUSAuyZHDyfqix+CcT+nJB7Kth5TEoNoRh5o=; b=mCAUN4J8lpnOK7yj1uPc6ExiQ7ZkcoOxn42d0ZS8zQj6N76R/8EptxJQvbz4SM1dtF RhTVLEKCzftBNOvjxDRSGr3kD39l59iEuozVcZ8UtQnX0wiFmqrN3F6meV8XU+tl50MI ZHxx1Kvu4EfYizAT6Yq9/vOC97aPN357HAh9msdFd8mrUEabmUukPHRrzBgBGCDiHNuv 1k1Fek/7xJf2vC63/42L90scA8yz1LAHgUmuQhIxxa0JbZZ8ahM+FKw6u+qf9J4ae0ii /u6DcojeanmCxsDlwVa5nGYG35l3Ko714KhVZBjsYaAOKdyRiw63zrLkJ+Al4dRtjJdm Q5cQ== X-Gm-Message-State: AOAM533uLzPEqXsMvdpLrp5HD2qvPV9bLJ24kvAoZlK+hBjuZaH8BVs3 C2FqxhxrtozwGHKOyo8ZsJ8XRjU/J6UnsQ== X-Google-Smtp-Source: ABdhPJx0Hy3nlGm7HencRgaGoeD/DQXLuU38pMIZBig8aN1aNOiGDkLUE/yuJCloY3u0TWF+L9bRuw== X-Received: by 2002:a0c:8b60:: with SMTP id d32mr48629215qvc.60.1609182615693; Mon, 28 Dec 2020 11:10:15 -0800 (PST) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id y16sm21567410qki.132.2020.12.28.11.10.14 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Dec 2020 11:10:14 -0800 (PST) Subject: Re: [PATCH 2/2] io: Remove xmknod{at} implementations From: Adhemerval Zanella To: libc-alpha@sourceware.org References: <20201202193938.2345469-1-adhemerval.zanella@linaro.org> <20201202193938.2345469-2-adhemerval.zanella@linaro.org> Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: Date: Mon, 28 Dec 2020 16:10:13 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201202193938.2345469-2-adhemerval.zanella@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-15.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Mon, 28 Dec 2020 19:10:18 -0000 If no one opposes it, I will commit this. On 02/12/2020 16:39, Adhemerval Zanella wrote: > With xmknod wrapper functions removed (589260cef8), the mknod functions > are now properly exported, and version is done using symbols versioning > instead of the extra _MKNOD_* argument. > > It also allows us to consolidate Linux and Hurd mknod implementation. > --- > io/Makefile | 2 +- > io/mknod.c | 4 +-- > io/mknodat.c | 5 ++- > io/xmknod.c | 40 --------------------- > io/xmknodat.c | 62 -------------------------------- > sysdeps/mach/hurd/Makefile | 1 + > sysdeps/mach/hurd/mknod.c | 31 ---------------- > sysdeps/unix/sysv/linux/Makefile | 3 +- > sysdeps/unix/sysv/linux/mknod.c | 28 --------------- > 9 files changed, 10 insertions(+), 166 deletions(-) > delete mode 100644 io/xmknod.c > delete mode 100644 io/xmknodat.c > delete mode 100644 sysdeps/mach/hurd/mknod.c > delete mode 100644 sysdeps/unix/sysv/linux/mknod.c > > diff --git a/io/Makefile b/io/Makefile > index 887a989c03..d3d0dcf767 100644 > --- a/io/Makefile > +++ b/io/Makefile > @@ -34,7 +34,7 @@ routines := \ > mkfifo mkfifoat \ > stat fstat lstat stat64 fstat64 lstat64 fstatat fstatat64 \ > statx \ > - mknod mknodat xmknod xmknodat \ > + mknod mknodat \ > statfs fstatfs statfs64 fstatfs64 \ > statvfs fstatvfs statvfs64 fstatvfs64 \ > umask chmod fchmod lchmod fchmodat \ > diff --git a/io/mknod.c b/io/mknod.c > index 9eb4a2af7f..22566b259c 100644 > --- a/io/mknod.c > +++ b/io/mknod.c > @@ -15,13 +15,13 @@ > License along with the GNU C Library; if not, see > . */ > > -#include > #include > +#include > > int > __mknod (const char *path, mode_t mode, dev_t dev) > { > - return __xmknod (_MKNOD_VER, path, mode, &dev); > + return __mknodat (AT_FDCWD, path, mode, dev); > } > libc_hidden_def (__mknod) > weak_alias (__mknod, mknod) > diff --git a/io/mknodat.c b/io/mknodat.c > index 63a8068ad6..cf491f99a7 100644 > --- a/io/mknodat.c > +++ b/io/mknodat.c > @@ -21,7 +21,10 @@ > int > __mknodat (int fd, const char *path, mode_t mode, dev_t dev) > { > - return __xmknodat (_MKNOD_VER, fd, path, mode, &dev); > + __set_errno (ENOSYS); > + return -1; > } > libc_hidden_def (__mknodat) > weak_alias (__mknodat, mknodat) > + > +stub_warning (mknodat) > diff --git a/io/xmknod.c b/io/xmknod.c > deleted file mode 100644 > index 832dbf778e..0000000000 > --- a/io/xmknod.c > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Copyright (C) 1991-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 > - > -/* 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 > -__xmknod (int vers, const char *path, mode_t mode, dev_t *dev) > -{ > - if (vers != _MKNOD_VER) > - { > - __set_errno (EINVAL); > - return -1; > - } > - > - __set_errno (ENOSYS); > - return -1; > -} > -stub_warning (__xmknod) > - > -weak_alias (__xmknod, _xmknod) > -libc_hidden_def (__xmknod) > diff --git a/io/xmknodat.c b/io/xmknodat.c > deleted file mode 100644 > index b6c668170b..0000000000 > --- a/io/xmknodat.c > +++ /dev/null > @@ -1,62 +0,0 @@ > -/* Copyright (C) 2005-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 > -#include > -#include > - > -/* 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). */ > -int > -__xmknodat (int vers, int fd, const char *path, mode_t mode, dev_t *dev) > -{ > - if (vers != _MKNOD_VER) > - { > - __set_errno (EINVAL); > - return -1; > - } > - > - if (path == NULL) > - { > - __set_errno (EINVAL); > - return -1; > - } > - > - if (fd != AT_FDCWD && path[0] != '/') > - { > - /* Check FD is associated with a directory. */ > - struct stat64 st; > - if (__fstat64 (fd, &st) != 0) > - return -1; > - > - if (!S_ISDIR (st.st_mode)) > - { > - __set_errno (ENOTDIR); > - return -1; > - } > - } > - > - __set_errno (ENOSYS); > - return -1; > -} > -stub_warning (__xmknodat) > - > -libc_hidden_def (__xmknodat) > diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile > index 571277cf7f..90c6b0e9a3 100644 > --- a/sysdeps/mach/hurd/Makefile > +++ b/sysdeps/mach/hurd/Makefile > @@ -201,6 +201,7 @@ sysdep_routines += f_setlk close_nocancel close_nocancel_nostatus \ > pread64_nocancel write_nocancel pwrite64_nocancel \ > wait4_nocancel \ > xstat fxstat lxstat xstat64 fxstat64 lxstat64 \ > + xmknod xmknodat \ > fxstatat fxstatat64 > endif > > diff --git a/sysdeps/mach/hurd/mknod.c b/sysdeps/mach/hurd/mknod.c > deleted file mode 100644 > index 1b9c9db741..0000000000 > --- a/sysdeps/mach/hurd/mknod.c > +++ /dev/null > @@ -1,31 +0,0 @@ > -/* Copyright (C) 1991-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 > - > -/* Create a device file named FILE_NAME, 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 > -__mknod (const char *file_name, mode_t mode, dev_t dev) > -{ > - return __mknodat (AT_FDCWD, file_name, mode, dev); > -} > -libc_hidden_def (__mknod) > -weak_alias (__mknod, mknod) > diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile > index 899b6c9c77..472eab700d 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -63,7 +63,8 @@ sysdep_routines += adjtimex clone umount umount2 readahead sysctl \ > process_vm_readv process_vm_writev clock_adjtime \ > time64-support pselect32 \ > xstat fxstat lxstat xstat64 fxstat64 lxstat64 \ > - fxstatat fxstatat64 > + fxstatat fxstatat64 \ > + xmknod xmknodat > > CFLAGS-gethostid.c = -fexceptions > CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables > diff --git a/sysdeps/unix/sysv/linux/mknod.c b/sysdeps/unix/sysv/linux/mknod.c > deleted file mode 100644 > index 7e290ddc8b..0000000000 > --- a/sysdeps/unix/sysv/linux/mknod.c > +++ /dev/null > @@ -1,28 +0,0 @@ > -/* 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 (AT_FDCWD, path, mode, dev); > -} > -libc_hidden_def (__mknod) > -weak_alias (__mknod, mknod) >