lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

linux: Consolidate statfs implementations

Browse Source 
The __NR_statfs64 syscall is supported on all architectures but
aarch64, mips64, riscv64, and x86_64.  And newer ABIs also uses
the new statfs64 interface (where the struct size is used as
second argument).

So the default implementation now uses:

  1. __NR_statfs64 for non-LFS call and handle overflow directly
     There is no need to handle __NR_statfs since all architectures
     that only support are LFS only.

  2. __NR_statfs if defined or __NR_statfs64 otherwise for LFS
     call.

Alpha is the only outlier, since it is a 64-bit architecture which
provides non-LFS interface and only provides __NR_statfs64 on
newer kernels (v5.1+).

Checked on x86_64-linux-gnu.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Adhemerval Zanella
2021-02-05 21:26:57 +00:00
parent 1bfbaf7130
commit f6e616435d
9 changed files with 125 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c → sysdeps/unix/sysv/linux/alpha/statfs.c
View File

@ -1,6 +1,6 @@
/* Copyright (C) 2011-2021 Free Software Foundation, Inc.
/* Return information about the filesystem on which FILE resides. Linux/alpha.
Copyright (C) 1996-2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 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
@ -13,24 +13,18 @@
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
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <sys/statfs.h>
#include <kernel_stat.h>
#include <sysdep.h>
#if !STATFS_IS_STATFS64
#include "overflow.h"
#include <kernel_stat.h>
/* Return information about the filesystem on which FILE resides. */
int
__statfs (const char *file, struct statfs *buf)
{
int rc = INLINE_SYSCALL (statfs64, 3, file, sizeof (*buf), buf);
return rc ?: statfs_overflow (buf);
return INLINE_SYSCALL_CALL (statfs, file, buf);
}
libc_hidden_def (__statfs)
weak_alias (__statfs, statfs)
#endif

52
sysdeps/unix/sysv/linux/alpha/statfs64.c
View File

@ -1 +1,51 @@
#include <sysdeps/unix/sysv/linux/statfs64.c>
/* Return information about the filesystem on which FILE resides. Linux/alpha.
Copyright (C) 1996-2021 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
<https://www.gnu.org/licenses/>. */
#include <sys/statfs.h>
#include <sysdep.h>
#include <kernel_stat.h>
/* Return information about the filesystem on which FILE resides. */
int
__statfs64 (const char *file, struct statfs64 *buf)
{
int r = INLINE_SYSCALL_CALL (statfs64, file, sizeof (*buf), buf);
#if __ASSUME_STATFS64 == 0
if (r == -1 && errno == ENOSYS)
{
struct statfs buf32;
if (__statfs (file, &buf32) < 0)
return -1;
buf->f_type = buf32.f_type;
buf->f_bsize = buf32.f_bsize;
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_fsid = buf32.f_fsid;
buf->f_namelen = buf32.f_namelen;
buf->f_frsize = buf32.f_frsize;
buf->f_flags = buf32.f_flags;
memcpy (buf->f_spare, buf32.f_spare, sizeof (buf32.f_spare));
}
#endif
return r;
}
weak_alias (__statfs64, statfs64)

3
sysdeps/unix/sysv/linux/alpha/syscalls.list
View File

@ -27,6 +27,3 @@ getitimer - getitimer i:ip __getitimer getitimer@@GLIBC_2.1
setitimer - setitimer i:ipP __setitimer setitimer@@GLIBC_2.1
utimes - utimes i:sp __utimes utimes@@GLIBC_2.1
getrusage - getrusage i:ip __getrusage getrusage@@GLIBC_2.1
# avoid 64-bit aliases on 32-bit statfs syscalls
statfs - statfs i:sp __statfs statfs

1
sysdeps/unix/sysv/linux/mips/mips64/n64/statfs64.c
View File

@ -1 +0,0 @@
/* Empty. */

2
sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
View File

@ -4,6 +4,4 @@ prlimit EXTRA prlimit64 i:iipp prlimit prlimit64
fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark
statfs - statfs i:sp __statfs statfs statfs64 __statfs64
sendfile - sendfile i:iipi sendfile sendfile64

61
sysdeps/unix/sysv/linux/statfs.c Normal file
View File

@ -0,0 +1,61 @@
/* Copyright (C) 2011-2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 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
<https://www.gnu.org/licenses/>. */
#include <sys/statfs.h>
#include <time.h>
#include <sysdep.h>
#include <kernel_stat.h>
#if !STATFS_IS_STATFS64
/* Return information about the filesystem on which FILE resides. */
int
__statfs (const char *file, struct statfs *buf)
{
struct statfs64 buf64;
int rc = INLINE_SYSCALL_CALL (statfs64, file, sizeof (buf64), &buf64);
if (rc == 0)
{
buf->f_type = buf64.f_type;
buf->f_bsize = buf64.f_bsize;
buf->f_blocks = buf64.f_blocks;
buf->f_bfree = buf64.f_bfree;
buf->f_bavail = buf64.f_bavail;
buf->f_files = buf64.f_files;
buf->f_ffree = buf64.f_ffree;
buf->f_fsid = buf64.f_fsid;
buf->f_namelen = buf64.f_namelen;
buf->f_frsize = buf64.f_frsize;
buf->f_flags = buf64.f_flags;
memcpy (buf->f_spare, buf64.f_spare, sizeof (buf64.f_spare));
if ((fsblkcnt_t) buf64.f_blocks != buf64.f_blocks
|| (fsblkcnt_t) buf64.f_bfree != buf64.f_bfree
|| (fsblkcnt_t) buf64.f_bavail != buf64.f_bavail
|| (fsblkcnt_t) buf64.f_files != buf64.f_files
|| (fsblkcnt_t) buf64.f_ffree != buf64.f_ffree)
{
__set_errno (EOVERFLOW);
return -1;
}
}
return rc;
}
libc_hidden_def (__statfs)
weak_alias (__statfs, statfs)
#endif

69
sysdeps/unix/sysv/linux/statfs64.c
View File

@ -16,79 +16,26 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <string.h>
#include <stddef.h>
#define __statfs __statfs_disable
#define statfs statfs_disable
#include <sys/statfs.h>
#include <sysdep.h>
#include <kernel_stat.h>
/* Hide the prototypes for __statfs and statfs so that GCC will not
complain about the different function signatures if they are aliased
to __stat64. If STATFS_IS_STATFS64 is not zero then the statfs and
statfs64 structures have an identical layout but different type names. */
#if STATFS_IS_STATFS64
# define __statfs __statfs_disable
# define statfs statfs_disable
#endif
#include <sys/statfs.h>
#include <kernel-features.h>
# if __ASSUME_STATFS64 == 0
int __no_statfs64 attribute_hidden;
#endif
#undef __statfs
#undef statfs
/* Return information about the filesystem on which FILE resides. */
int
__statfs64 (const char *file, struct statfs64 *buf)
{
#ifdef __NR_statfs64
# if __ASSUME_STATFS64 == 0
if (! __no_statfs64)
# endif
{
int result = INLINE_SYSCALL (statfs64, 3, file, sizeof (*buf), buf);
# if __ASSUME_STATFS64 == 0
if (result == 0 || errno != ENOSYS)
# endif
return result;
# if __ASSUME_STATFS64 == 0
__no_statfs64 = 1;
# endif
}
#endif
#if __ASSUME_STATFS64 == 0
struct statfs buf32;
if (__statfs (file, &buf32) < 0)
return -1;
buf->f_type = buf32.f_type;
buf->f_bsize = buf32.f_bsize;
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_fsid = buf32.f_fsid;
buf->f_namelen = buf32.f_namelen;
buf->f_frsize = buf32.f_frsize;
buf->f_flags = buf32.f_flags;
memcpy (buf->f_spare, buf32.f_spare, sizeof (buf32.f_spare));
return 0;
return INLINE_SYSCALL_CALL (statfs64, file, sizeof (*buf), buf);
#else
return INLINE_SYSCALL_CALL (statfs, file, buf);
#endif
}
weak_alias (__statfs64, statfs64)
#undef __statfs
#undef statfs
#if STATFS_IS_STATFS64
weak_alias (__statfs64, __statfs)
weak_alias (__statfs64, statfs)

1
sysdeps/unix/sysv/linux/wordsize-64/statfs64.c
View File

@ -1 +0,0 @@
/* statfs64 is the same as statfs. */

1
sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
View File

@ -1,6 +1,5 @@
# File name Caller Syscall name # args Strong name Weak names
statfs - statfs i:sp __statfs statfs statfs64
sendfile - sendfile i:iipi sendfile sendfile64
prlimit EXTRA prlimit64 i:iipp prlimit prlimit64