[07/10] linux: Consolidate statvfs implementations
Commit Message
There is no need to handle ENOSYS on fstatfs64 call, required only
for alpha (where is already fallbacks to fstatfs).
Checked on x86_64-linux-gnu.
---
include/sys/statvfs.h | 3 +-
sysdeps/unix/sysv/linux/alpha/statvfs.c | 1 -
sysdeps/unix/sysv/linux/alpha/statvfs64.c | 1 -
sysdeps/unix/sysv/linux/statvfs.c | 9 ++--
sysdeps/unix/sysv/linux/statvfs64.c | 54 +++++++------------
sysdeps/unix/sysv/linux/wordsize-64/statvfs.c | 5 --
.../unix/sysv/linux/wordsize-64/statvfs64.c | 1 -
7 files changed, 26 insertions(+), 48 deletions(-)
delete mode 100644 sysdeps/unix/sysv/linux/alpha/statvfs.c
delete mode 100644 sysdeps/unix/sysv/linux/alpha/statvfs64.c
delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/statvfs.c
delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/statvfs64.c
Comments
On 2/8/21 4:49 PM, Adhemerval Zanella via Libc-alpha wrote:
> There is no need to handle ENOSYS on fstatfs64 call, required only
> for alpha (where is already fallbacks to fstatfs).
>
> Checked on x86_64-linux-gnu.
LGTM.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
> ---
> include/sys/statvfs.h | 3 +-
> sysdeps/unix/sysv/linux/alpha/statvfs.c | 1 -
> sysdeps/unix/sysv/linux/alpha/statvfs64.c | 1 -
> sysdeps/unix/sysv/linux/statvfs.c | 9 ++--
> sysdeps/unix/sysv/linux/statvfs64.c | 54 +++++++------------
> sysdeps/unix/sysv/linux/wordsize-64/statvfs.c | 5 --
> .../unix/sysv/linux/wordsize-64/statvfs64.c | 1 -
> 7 files changed, 26 insertions(+), 48 deletions(-)
> delete mode 100644 sysdeps/unix/sysv/linux/alpha/statvfs.c
> delete mode 100644 sysdeps/unix/sysv/linux/alpha/statvfs64.c
> delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/statvfs.c
> delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/statvfs64.c
>
> diff --git a/include/sys/statvfs.h b/include/sys/statvfs.h
> index 4cd1977c35..d7fe33119a 100644
> --- a/include/sys/statvfs.h
> +++ b/include/sys/statvfs.h
> @@ -3,8 +3,7 @@
>
> #ifndef _ISOMAC
> /* Now define the internal interfaces. */
> -extern int __statvfs64 (const char *__file, struct statvfs64 *__buf)
> - attribute_hidden;
> +extern int __statvfs64 (const char *__file, struct statvfs64 *__buf);
OK.
> extern int __fstatvfs64 (int __fildes, struct statvfs64 *__buf)
> attribute_hidden;
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/statvfs.c b/sysdeps/unix/sysv/linux/alpha/statvfs.c
> deleted file mode 100644
> index 78069e96f4..0000000000
> --- a/sysdeps/unix/sysv/linux/alpha/statvfs.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/statvfs.c>
> diff --git a/sysdeps/unix/sysv/linux/alpha/statvfs64.c b/sysdeps/unix/sysv/linux/alpha/statvfs64.c
> deleted file mode 100644
> index c80e17751d..0000000000
> --- a/sysdeps/unix/sysv/linux/alpha/statvfs64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/statvfs64.c>
> diff --git a/sysdeps/unix/sysv/linux/statvfs.c b/sysdeps/unix/sysv/linux/statvfs.c
> index 8895694e5d..f165899711 100644
> --- a/sysdeps/unix/sysv/linux/statvfs.c
> +++ b/sysdeps/unix/sysv/linux/statvfs.c
> @@ -16,11 +16,13 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -#include <stddef.h>
> -#include <sys/stat.h>
> +#include <sys/statvfs.h>
> #include <sys/statfs.h>
> -#include "internal_statvfs.h"
> +#include <internal_statvfs.h>
> +#include <time.h>
> +#include <kernel_stat.h>
>
> +#if !STATFS_IS_STATFS64
> int
> __statvfs (const char *file, struct statvfs *buf)
> {
> @@ -38,3 +40,4 @@ __statvfs (const char *file, struct statvfs *buf)
> }
> weak_alias (__statvfs, statvfs)
> libc_hidden_weak (statvfs)
> +#endif
> diff --git a/sysdeps/unix/sysv/linux/statvfs64.c b/sysdeps/unix/sysv/linux/statvfs64.c
> index b03a88816c..3d29908afa 100644
> --- a/sysdeps/unix/sysv/linux/statvfs64.c
> +++ b/sysdeps/unix/sysv/linux/statvfs64.c
> @@ -16,49 +16,33 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -#include <errno.h>
> -#include <stddef.h>
> -#include <string.h>
> -#include <sys/stat.h>
> +#define __statvfs __statvfs_disable
> +#define statvfs statvfs_disable
> +#include <sys/statvfs.h>
> #include <sys/statfs.h>
> -#include "internal_statvfs.h"
> -#include <kernel-features.h>
> +#include <internal_statvfs.h>
> +#include <time.h>
> +#include <kernel_stat.h>
>
> /* Return information about the filesystem on which FILE resides. */
> int
> __statvfs64 (const char *file, struct statvfs64 *buf)
> {
> struct statfs64 fsbuf;
> - int res = __statfs64 (file, &fsbuf);
> + if (__statfs64 (file, &fsbuf) < 0)
> + return -1;
>
> -#ifndef __ASSUME_STATFS64
> - if (res < 0 && errno == ENOSYS)
> - {
> - struct statvfs buf32;
> + /* Convert the result. */
> + __internal_statvfs64 (file, buf, &fsbuf, -1);
>
> - res = statvfs (file, &buf32);
> - if (res == 0)
> - {
> - buf->f_bsize = buf32.f_bsize;
> - buf->f_frsize = buf32.f_frsize;
> - buf->f_blocks = buf32.f_blocks;
> - buf->f_bfree = buf32.f_bfree;
> - buf->f_bavail = buf32.f_bavail;
> - buf->f_files = buf32.f_files;
> - buf->f_ffree = buf32.f_ffree;
> - buf->f_favail = buf32.f_favail;
> - buf->f_fsid = buf32.f_fsid;
> - buf->f_flag = buf32.f_flag;
> - buf->f_namemax = buf32.f_namemax;
> - memcpy (buf->__f_spare, buf32.__f_spare, sizeof (buf32.__f_spare));
> - }
> - }
> -#endif
> -
> - if (res == 0)
> - /* Convert the result. */
> - __internal_statvfs64 (file, buf, &fsbuf, -1);
> -
> - return res;
> + return 0;
> }
> weak_alias (__statvfs64, statvfs64)
> +
> +#undef __statvfs
> +#undef statvfs
> +
> +#if STATFS_IS_STATFS64
> +weak_alias (__statvfs64, __statvfs)
> +weak_alias (__statvfs64, statvfs)
> +#endif
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/statvfs.c b/sysdeps/unix/sysv/linux/wordsize-64/statvfs.c
> deleted file mode 100644
> index 1e1c96333b..0000000000
> --- a/sysdeps/unix/sysv/linux/wordsize-64/statvfs.c
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -#define __statvfs64(file, buf) __no_statvfs64(file, buf)
> -#define statvfs64(file, buf) no_statvfs64(file, buf)
> -#include "../statvfs.c"
> -strong_alias (__statvfs, __statvfs64)
> -weak_alias (__statvfs, statvfs64)
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/statvfs64.c b/sysdeps/unix/sysv/linux/wordsize-64/statvfs64.c
> deleted file mode 100644
> index 510015e420..0000000000
> --- a/sysdeps/unix/sysv/linux/wordsize-64/statvfs64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -/* statvfs64 is the same as statvfs. */
>
@@ -3,8 +3,7 @@
#ifndef _ISOMAC
/* Now define the internal interfaces. */
-extern int __statvfs64 (const char *__file, struct statvfs64 *__buf)
- attribute_hidden;
+extern int __statvfs64 (const char *__file, struct statvfs64 *__buf);
extern int __fstatvfs64 (int __fildes, struct statvfs64 *__buf)
attribute_hidden;
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/statvfs.c>
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/statvfs64.c>
@@ -16,11 +16,13 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <stddef.h>
-#include <sys/stat.h>
+#include <sys/statvfs.h>
#include <sys/statfs.h>
-#include "internal_statvfs.h"
+#include <internal_statvfs.h>
+#include <time.h>
+#include <kernel_stat.h>
+#if !STATFS_IS_STATFS64
int
__statvfs (const char *file, struct statvfs *buf)
{
@@ -38,3 +40,4 @@ __statvfs (const char *file, struct statvfs *buf)
}
weak_alias (__statvfs, statvfs)
libc_hidden_weak (statvfs)
+#endif
@@ -16,49 +16,33 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <stddef.h>
-#include <string.h>
-#include <sys/stat.h>
+#define __statvfs __statvfs_disable
+#define statvfs statvfs_disable
+#include <sys/statvfs.h>
#include <sys/statfs.h>
-#include "internal_statvfs.h"
-#include <kernel-features.h>
+#include <internal_statvfs.h>
+#include <time.h>
+#include <kernel_stat.h>
/* Return information about the filesystem on which FILE resides. */
int
__statvfs64 (const char *file, struct statvfs64 *buf)
{
struct statfs64 fsbuf;
- int res = __statfs64 (file, &fsbuf);
+ if (__statfs64 (file, &fsbuf) < 0)
+ return -1;
-#ifndef __ASSUME_STATFS64
- if (res < 0 && errno == ENOSYS)
- {
- struct statvfs buf32;
+ /* Convert the result. */
+ __internal_statvfs64 (file, buf, &fsbuf, -1);
- res = statvfs (file, &buf32);
- if (res == 0)
- {
- buf->f_bsize = buf32.f_bsize;
- buf->f_frsize = buf32.f_frsize;
- buf->f_blocks = buf32.f_blocks;
- buf->f_bfree = buf32.f_bfree;
- buf->f_bavail = buf32.f_bavail;
- buf->f_files = buf32.f_files;
- buf->f_ffree = buf32.f_ffree;
- buf->f_favail = buf32.f_favail;
- buf->f_fsid = buf32.f_fsid;
- buf->f_flag = buf32.f_flag;
- buf->f_namemax = buf32.f_namemax;
- memcpy (buf->__f_spare, buf32.__f_spare, sizeof (buf32.__f_spare));
- }
- }
-#endif
-
- if (res == 0)
- /* Convert the result. */
- __internal_statvfs64 (file, buf, &fsbuf, -1);
-
- return res;
+ return 0;
}
weak_alias (__statvfs64, statvfs64)
+
+#undef __statvfs
+#undef statvfs
+
+#if STATFS_IS_STATFS64
+weak_alias (__statvfs64, __statvfs)
+weak_alias (__statvfs64, statvfs)
+#endif
deleted file mode 100644
@@ -1,5 +0,0 @@
-#define __statvfs64(file, buf) __no_statvfs64(file, buf)
-#define statvfs64(file, buf) no_statvfs64(file, buf)
-#include "../statvfs.c"
-strong_alias (__statvfs, __statvfs64)
-weak_alias (__statvfs, statvfs64)
deleted file mode 100644
@@ -1 +0,0 @@
-/* statvfs64 is the same as statvfs. */