From cf2478d53ad7071e84c724a986b56fe17f4f4ca7 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Sun, 18 Mar 2018 11:28:59 +0800 Subject: [PATCH] Deprecate ustat syscall interface As for sysctl, ustat has been deprecated in favor of {f}statfs. Also some newer ports which uses generic interface builds a stub version that returns ENOSYS. This patch deprecates ustat interface by removing ustat.h related headers, adding a compatibility symbol, and avoiding new ports to build and provide the symbol. 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 | 28 ++++++++++++++ NEWS | 4 ++ 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, 93 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/ChangeLog b/ChangeLog index 180cca43aa..9f76a982c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2018-05-02 Adhemerval Zanella + + * 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. + + * NEWS: Add sysctl.h deprecation entry. + * include/sys/sysctl.h: Remove file. + * sysdeps/unix/sysv/linux/bits/sysctl.h: Likewise. + * sysdeps/unix/sysv/linux/generic/sysctl.c: Likewise. + * sysdeps/unix/sysv/linux/sys/sysctl.h: Likewise. + * sysdeps/unix/sysv/linux/x86/bits/sysctl.h: Likewise. + * manual/sysinfo.texi: Update sysctl documentation. + * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Remove + bits/sysctl. + * sysdeps/unix/sysv/linux/arm/ioperm.c (sysctl_call): New function. + (init_iosys): Call syscall_call instead of sysctl. + * sysdeps/unix/sysv/linux/sysctl.c (__sysctl): Rename to __old_sysctl + and export only in compatibility mode. + 2018-04-30 Tulio Magno Quites Machado Filho * math/w_exp_compat.c: Replace hidden_def with libm_hidden_def.. diff --git a/NEWS b/NEWS index 363e918da1..5155c86318 100644 --- a/NEWS +++ b/NEWS @@ -59,6 +59,10 @@ Deprecated and removed features, and other changes affecting compatibility: * The tilegx*-*-linux-gnu configurations are no longer supported. +* The obsolete function ustat is no longer available to newly linked + binaries; the headers and have been removed. This + function has been deprecated in favor of fstatfs and statfs. + 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 ac9accafa4..0000000000 --- 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 a5076b3672..a1d568b981 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 828ca4199b..0000000000 --- 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 e5abedae7b..2c40e2a3cb 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 {f}statfs). */ +#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 cba150e446..0000000000 --- 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 d4f9c8996f..0000000000 --- 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 1f597c9363..786a5ef330 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 8e73faad55..50204e4953 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 {f}statfs). */ +#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) */ -- 2.43.5