From d0501a245c7f6c8bf399594d9b331d915580d36f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 17 Sep 2003 00:49:19 +0000 Subject: Update. 2003-09-16 Ulrich Drepper * sysdeps/unix/sysv/linux/Dist: Remove internal_statvfs.c. * sysdeps/unix/sysv/linux/Makefile [subdir=io] (sysdep_routines): Add internal_statvfs. * sysdeps/unix/sysv/linux/fstatvfs.c: Call __internal_statvfs instead of including "internal_statvfs.c". * sysdeps/unix/sysv/linux/statvfs.c: Likewise. * sysdeps/unix/sysv/linux/internal_statvfs.c: Make it a real function. Add code to avoid the stat calls on all the reported mount points when we can determine mismatch in advance. * sysdeps/unix/sysv/linux/linux_fsinfo.h: Add AUTOFS_SUPER_MAGIC and USBDEVFS_SUPER_MAGIC. 2003-09-16 Jakub Jelinek * posix/Versions (sched_getaffinity, sched_setaffinity): Change from GLIBC_2.3.2 to GLIBC_2.3.3 symbol version. 2003-09-16 Bruno Haible * intl/tst-gettext2.sh: Set GCONV_PATH and LOCPATH only after invoking msgfmt, not before. --- sysdeps/unix/sysv/linux/statvfs.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'sysdeps/unix/sysv/linux/statvfs.c') diff --git a/sysdeps/unix/sysv/linux/statvfs.c b/sysdeps/unix/sysv/linux/statvfs.c index 5eef62c5f6..51d4f4fd0c 100644 --- a/sysdeps/unix/sysv/linux/statvfs.c +++ b/sysdeps/unix/sysv/linux/statvfs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -17,16 +17,14 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include -#include -#include -#include -#include -#include +#include #include #include #include +extern void __internal_statvfs (const char *name, struct statvfs *buf, + struct statfs *fsbuf, struct stat64 *st); + int statvfs (const char *file, struct statvfs *buf) @@ -38,8 +36,9 @@ statvfs (const char *file, struct statvfs *buf) if (__statfs (file, &fsbuf) < 0) return -1; -#define STAT(st) stat64 (file, st) -#include "internal_statvfs.c" + /* Convert the result. */ + __internal_statvfs (file, buf, &fsbuf, + stat64 (file, &st) == -1 ? NULL : &st); /* We signal success if the statfs call succeeded. */ return 0; -- cgit v1.2.3