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 statvfs implementations

Browse Source 
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.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Adhemerval Zanella
2021-02-06 11:26:28 +00:00
parent 6ea1603d65
commit 52f527d6f1
7 changed files with 26 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/sys/statvfs.h
View File

@ -3,8 +3,7 @@
#ifndef _ISOMAC #ifndef _ISOMAC
/* Now define the internal interfaces. */ /* Now define the internal interfaces. */
extern int __statvfs64 (const char *__file, struct statvfs64 *__buf) extern int __statvfs64 (const char *__file, struct statvfs64 *__buf);
attribute_hidden;
extern int __fstatvfs64 (int __fildes, struct statvfs64 *__buf) extern int __fstatvfs64 (int __fildes, struct statvfs64 *__buf)
attribute_hidden; attribute_hidden;

1
sysdeps/unix/sysv/linux/alpha/statvfs.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/statvfs.c>

1
sysdeps/unix/sysv/linux/alpha/statvfs64.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/statvfs64.c>

9
sysdeps/unix/sysv/linux/statvfs.c
View File

@ -16,11 +16,13 @@
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/>. */ <https://www.gnu.org/licenses/>. */
#include <stddef.h> #include <sys/statvfs.h>
#include <sys/stat.h>
#include <sys/statfs.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 int
__statvfs (const char *file, struct statvfs *buf) __statvfs (const char *file, struct statvfs *buf)
{ {
@ -38,3 +40,4 @@ __statvfs (const char *file, struct statvfs *buf)
} }
weak_alias (__statvfs, statvfs) weak_alias (__statvfs, statvfs)
libc_hidden_weak (statvfs) libc_hidden_weak (statvfs)
#endif

54
sysdeps/unix/sysv/linux/statvfs64.c
View File

@ -16,49 +16,33 @@
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/>. */ <https://www.gnu.org/licenses/>. */
#include <errno.h> #define __statvfs __statvfs_disable
#include <stddef.h> #define statvfs statvfs_disable
#include <string.h> #include <sys/statvfs.h>
#include <sys/stat.h>
#include <sys/statfs.h> #include <sys/statfs.h>
#include "internal_statvfs.h" #include <internal_statvfs.h>
#include <kernel-features.h> #include <time.h>
#include <kernel_stat.h>
/* Return information about the filesystem on which FILE resides. */ /* Return information about the filesystem on which FILE resides. */
int int
__statvfs64 (const char *file, struct statvfs64 *buf) __statvfs64 (const char *file, struct statvfs64 *buf)
{ {
struct statfs64 fsbuf; struct statfs64 fsbuf;
int res = __statfs64 (file, &fsbuf); if (__statfs64 (file, &fsbuf) < 0)
return -1;
#ifndef __ASSUME_STATFS64 /* Convert the result. */
if (res < 0 && errno == ENOSYS) __internal_statvfs64 (file, buf, &fsbuf, -1);
{
struct statvfs buf32;
res = statvfs (file, &buf32); return 0;
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;
} }
weak_alias (__statvfs64, statvfs64) weak_alias (__statvfs64, statvfs64)
#undef __statvfs
#undef statvfs
#if STATFS_IS_STATFS64
weak_alias (__statvfs64, __statvfs)
weak_alias (__statvfs64, statvfs)
#endif

5
sysdeps/unix/sysv/linux/wordsize-64/statvfs.c
View File

@ -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)

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

@ -1 +0,0 @@
/* statvfs64 is the same as statvfs. */