From patchwork Wed Apr 25 12:50:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 26937 Received: (qmail 3042 invoked by alias); 25 Apr 2018 12:51:06 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 130188 invoked by uid 89); 25 Apr 2018 12:51:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=H*r:10.0.0, HTo:U*joseph, Never X-HELO: mail-qt0-f196.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=5ERhdG7vXqyXG1TzDjgYu6zPwvBayiqbwkLKtPeODyE=; b=IFJk4c3Uw2Xi78KyvW5JY8GSdUN++Uae14fAMHToG1gzZccFM8vuC1PIvpdglFYwFu C3jcA9MoiGe5OIIJacI7SAv3nbsbAFQpbQ5hz3W+uimm/70L0oshefUHheT9y3noM2V+ eIef9gLa8DJqmS5qtc9WyHVH6OUaqT5Sc1ys4auR4S5qUTXK95Sl4rqo872LSETAneg2 go9norHjviFHNKqWGeAvNDFed6taJ2vBcQt8qeymLw4kcc3BAALAFkfnV0oB8VqYPfPm B5ZsfijY8VDECRro/ZiSKpXUOupslYVUCU7HgvRE1q1tYKCtqFfOktRGZUfA8vXE9NMy mzyg== X-Gm-Message-State: ALQs6tAHev7O9f/q62kiAv5MySNGfmWeeigZy1UjJEptvZIXZxRyA7TO suSPRen1DIIImK0ixPD0YISe0vDakUY= X-Google-Smtp-Source: AB8JxZo01wVa5iuCeJgdfJlePI8Q9O4ICNdArzvkGYTycPsdYSi6Au4oTLmd+X9/kNX/NX7vbGQl2g== X-Received: by 2002:aed:2d43:: with SMTP id h61-v6mr31616972qtd.31.1524660656819; Wed, 25 Apr 2018 05:50:56 -0700 (PDT) Subject: Re: [PATCH 2/2] Deprecate ustat syscall interface To: Joseph Myers Cc: libc-alpha@sourceware.org References: <1524523018-7216-1-git-send-email-adhemerval.zanella@linaro.org> <1524523018-7216-2-git-send-email-adhemerval.zanella@linaro.org> From: Adhemerval Zanella Openpgp: preference=signencrypt Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: Date: Wed, 25 Apr 2018 09:50:53 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: On 23/04/2018 20:16, Joseph Myers wrote: > Again, this is the wrong way to obsolete something - a new symbol version > should not be added as part of deprecation. And, any deprecation needs a > NEWS enty. > Below it is an updated patch which addresses the issues you brought. --- As for sysctl, ustat has been deprecated in favor of fstatfs. Newer ports which uses generic interface builds a stub version which returns ENOSYS. This patch deprecate ustat interface by issuing ENOSYS as default and adds compat symbol for architectures which still defines __NR_ustat. Checked on x86_64-linux-gnu and i686-linux-gnu. Also checked with a check-abi on all affected ABIs. * NEWS: Add ustat.h deprecation entry. * bits/ustat.h: Remove file. * misc/sys/ustat.h: Likewise. * misc/ustat.h: Likewise. * sysdeps/unix/sysv/linux/generic/ustat.c: Likewise. * misc/Makefile (headers): Remove ustat.h and sys/ustat.h. * misc/ustat.c (__ustat): Rename to __old_ustat and export only in compatibility mode. * sysdeps/unix/sysv/linux/ustat.c (__ustat): Likewise. * sysdeps/unix/sysv/linux/mips/ustat.c: Define DEV_TO_KDEV and use generic Linux implementation. --- ChangeLog | 12 ++++++++ NEWS | 5 ++++ bits/ustat.h | 30 -------------------- misc/Makefile | 2 +- misc/sys/ustat.h | 37 ------------------------ misc/ustat.c | 22 ++++++++++++--- misc/ustat.h | 1 - sysdeps/unix/sysv/linux/generic/ustat.c | 32 --------------------- sysdeps/unix/sysv/linux/mips/ustat.c | 21 +++++--------- sysdeps/unix/sysv/linux/ustat.c | 50 +++++++++++++++++++++++---------- 10 files changed, 78 insertions(+), 134 deletions(-) delete mode 100644 bits/ustat.h delete mode 100644 misc/sys/ustat.h delete mode 100644 misc/ustat.h delete mode 100644 sysdeps/unix/sysv/linux/generic/ustat.c diff --git a/NEWS b/NEWS index ffe3bb4..f8cd879 100644 --- a/NEWS +++ b/NEWS @@ -62,6 +62,11 @@ Deprecated and removed features, and other changes affecting compatibility: of /proc/sys. A compatibility symbol is still provided, however it is not being defined for static linking or for new ports. + * The header file is no longer installed. Software should + be updated to use 'statfs' instead. A compatibility symbol is still + provided, however it is not being defined for static linking or for + new ports. + Changes to build and runtime requirements: [Add changes to build and runtime requirements here] diff --git a/bits/ustat.h b/bits/ustat.h deleted file mode 100644 index ac9acca..0000000 --- a/bits/ustat.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 1997-2018 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 - . */ - -#ifndef _SYS_USTAT_H -# error "Never include directly; use instead." -#endif - -#include - -struct ustat - { - __daddr_t f_tfree; /* Number of free blocks. */ - __ino_t f_tinode; /* Number of free inodes. */ - char f_fname[6]; - char f_fpack[6]; - }; diff --git a/misc/Makefile b/misc/Makefile index a5076b3..a1d568b 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -31,7 +31,7 @@ headers := sys/uio.h bits/uio-ext.h bits/uio_lim.h \ sys/mman.h sys/param.h bits/param.h \ fstab.h mntent.h search.h err.h error.h \ sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \ - sys/select.h ustat.h sys/ustat.h bits/ustat.h sys/sysinfo.h \ + sys/select.h sys/sysinfo.h \ regexp.h bits/select.h bits/mman.h sys/xattr.h \ syslog.h sys/syslog.h \ bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h \ diff --git a/misc/sys/ustat.h b/misc/sys/ustat.h deleted file mode 100644 index 828ca41..0000000 --- a/misc/sys/ustat.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Header describing obsolete `ustat' interface. - Copyright (C) 1996-2018 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 - . */ - -/* - * This interface is obsolete. Use instead. - */ - -#ifndef _SYS_USTAT_H -#define _SYS_USTAT_H 1 - -#include - -#include -#include - -__BEGIN_DECLS - -extern int ustat (__dev_t __dev, struct ustat *__ubuf) __THROW; - -__END_DECLS - -#endif /* sys/ustat.h */ diff --git a/misc/ustat.c b/misc/ustat.c index e5abeda..717d6d7 100644 --- a/misc/ustat.c +++ b/misc/ustat.c @@ -16,14 +16,28 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include +#include + +/* This deprecated syscall is no longer used (replaced with fstat). */ +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_28) + +# include +# include + +struct ustat + { + __daddr_t f_tfree; /* Number of free blocks. */ + __ino_t f_tinode; /* Number of free inodes. */ + char f_fname[6]; + char f_fpack[6]; +}; int -ustat (dev_t dev, struct ustat *ust) +__old_ustat (dev_t dev, struct ustat *ust) { __set_errno (ENOSYS); return -1; } stub_warning (ustat) +compat_symbol (libc, __old_ustat, ustat, GLIBC_2_0); +#endif diff --git a/misc/ustat.h b/misc/ustat.h deleted file mode 100644 index cba150e..0000000 --- a/misc/ustat.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/generic/ustat.c b/sysdeps/unix/sysv/linux/generic/ustat.c deleted file mode 100644 index d4f9c89..0000000 --- a/sysdeps/unix/sysv/linux/generic/ustat.c +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (C) 2011-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Chris Metcalf , 2011. - - 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 - -/* This deprecated syscall is no longer used (replaced with fstat). */ -int -ustat (dev_t dev, struct ustat *ubuf) -{ - __set_errno (ENOSYS); - return -1; -} -stub_warning (ustat) diff --git a/sysdeps/unix/sysv/linux/mips/ustat.c b/sysdeps/unix/sysv/linux/mips/ustat.c index 1f597c9..786a5ef 100644 --- a/sysdeps/unix/sysv/linux/mips/ustat.c +++ b/sysdeps/unix/sysv/linux/mips/ustat.c @@ -16,20 +16,13 @@ License along with the GNU C Library. If not, see . */ -#include -#include #include -#include -#include +#define DEV_TO_KDEV(__dev) \ + ({ \ + unsigned long k_dev; \ + k_dev = ((major (dev) & 0xff) << 8) | (minor (dev) & 0xff); \ + k_dev; \ + }) -int -ustat (dev_t dev, struct ustat *ubuf) -{ - unsigned long k_dev; - - /* We must convert the value to dev_t type used by the kernel. */ - k_dev = ((major (dev) & 0xff) << 8) | (minor (dev) & 0xff); - - return INLINE_SYSCALL (ustat, 2, k_dev, ubuf); -} +#include diff --git a/sysdeps/unix/sysv/linux/ustat.c b/sysdeps/unix/sysv/linux/ustat.c index 8e73faa..accbc86 100644 --- a/sysdeps/unix/sysv/linux/ustat.c +++ b/sysdeps/unix/sysv/linux/ustat.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1997-2018 Free Software Foundation, Inc. +/* Get filesystem statistics (deprecated). Linux version. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -16,22 +17,41 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include +#include -#include -#include +/* This deprecated syscall is no longer used (replaced with fstat). */ +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_28) -int -ustat (dev_t dev, struct ustat *ubuf) -{ - unsigned long long int k_dev; +# include +# include + +# ifndef DEV_TO_KDEV +# define DEV_TO_KDEV(__dev) \ + ({ \ + unsigned long long int k_dev; \ + k_dev = dev & ((1ULL << 32) - 1); \ + if (k_dev != dev) \ + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); \ + (unsigned int) k_dev; \ + }) +# endif - /* We must convert the value to dev_t type used by the kernel. */ - k_dev = dev & ((1ULL << 32) - 1); - if (k_dev != dev) - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); +struct ustat +{ + __daddr_t f_tfree; /* Number of free blocks. */ + __ino_t f_tinode; /* Number of free inodes. */ + char f_fname[6]; + char f_fpack[6]; +}; - return INLINE_SYSCALL (ustat, 2, (unsigned int) k_dev, ubuf); +int +__old_ustat (dev_t dev, struct ustat *ubuf) +{ +# ifdef __NR_ustat + return INLINE_SYSCALL_CALL (ustat, DEV_TO_KDEV (dev), ubuf); +# else + return INLINE_SYSCALL_ERROR_RETURN_VALUE (ENOSYS); +# endif } +compat_symbol (libc, __old_ustat, ustat, GLIBC_2_0); +#endif /* SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_28) */