mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-30 12:31:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

linux: Consolidate fstatvfs implementations

Browse Source 
There is no need to handle ENOSYS on fstatfs64 call, required only
for alpha (where is already fallbacks to fstatfs).  The wordsize
internal_statvfs64.c is removed, since how the LFS support is
provided by fstatvfs64.c (used on 64-bit architectures as well).

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:32:57 +00:00
parent f6e616435d
commit 6ea1603d65
7 changed files with 25 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -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
__fstatvfs (int fd, struct statvfs *buf)
{
@ -38,3 +40,4 @@ __fstatvfs (int fd, struct statvfs *buf)
}
weak_alias (__fstatvfs, fstatvfs)
libc_hidden_weak (fstatvfs)
#endif

53
sysdeps/unix/sysv/linux/fstatvfs64.c
View File

@ -16,48 +16,33 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <string.h>
#include <sys/stat.h>
#define __fstatvfs __fstatvfs_disable
#define fstatvfs fstatvfs_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 FD resides. */
int
__fstatvfs64 (int fd, struct statvfs64 *buf)
{
struct statfs64 fsbuf;
int res = __fstatfs64 (fd, &fsbuf);
if (__fstatfs64 (fd, &fsbuf) < 0)
return -1;
#ifndef __ASSUME_STATFS64
if (res < 0 && errno == ENOSYS)
{
struct statvfs buf32;
/* Convert the result. */
__internal_statvfs64 (NULL, buf, &fsbuf, fd);
res = fstatvfs (fd, &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 (NULL, buf, &fsbuf, fd);
return res;
return 0;
}
weak_alias (__fstatvfs64, fstatvfs64)
#undef __fstatvfs
#undef fstatvfs
#if STATFS_IS_STATFS64
weak_alias (__fstatvfs64, __fstatvfs)
weak_alias (__fstatvfs64, fstatvfs)
#endif

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

@ -1,5 +0,0 @@
#define __fstatvfs64(file, buf) __no_fstatvfs64(file, buf)
#define fstatvfs64(file, buf) no_fstatvfs64(file, buf)
#include "../fstatvfs.c"
strong_alias (__fstatvfs, __fstatvfs64)
weak_alias (__fstatvfs, fstatvfs64)

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

@ -1 +0,0 @@
/* fstatvfs64 is the same as fstatvfs. */

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

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