about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/internal_statvfs.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-24 18:59:03 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-24 18:59:03 +0000
commit51d1ca00fd1ddc2ed77b615b7a23ecdf3e8a55a9 (patch)
treefa436b689653e00dadaafd8f2dacd29bd7b97ef7 /sysdeps/unix/sysv/linux/internal_statvfs.c
parentcd18a5f14aab2ccffc304d8149c9dae5028b465f (diff)
downloadglibc-51d1ca00fd1ddc2ed77b615b7a23ecdf3e8a55a9.tar.gz
glibc-51d1ca00fd1ddc2ed77b615b7a23ecdf3e8a55a9.tar.xz
glibc-51d1ca00fd1ddc2ed77b615b7a23ecdf3e8a55a9.zip
Update.
2003-06-24  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/fstatfs64.c (__fstatfs64): Add support
	for the fstatfs64 syscall.
	* sysdeps/unix/sysv/linux/statfs64.c (__statfs64): Add support for
	the statfs64 syscall.

	* sysdeps/unix/sysv/linux/kernel-features.h: Define
	__ASSUME_STATFS64 appropriately.

	* sysdeps/unix/sysv/linux/internal_statvfs.c: Use f_frsize field
	from statfs structure if it has been filled in.

	* sysdeps/unix/sysv/linux/bits/statfs.h (struct statfs): Add f_frsize
	field.
	(struct statfs64): Likewise.
	* sysdeps/unix/sysv/linux/alpha/bits/statfs.h: Likewise.
	* sysdeps/unix/sysv/linux/s390/bits/statfs.h: Likewise.

	instead of __libc_cleanup_region_*.
Diffstat (limited to 'sysdeps/unix/sysv/linux/internal_statvfs.c')
-rw-r--r--sysdeps/unix/sysv/linux/internal_statvfs.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c
index 744c8d9fd6..9317cef90d 100644
--- a/sysdeps/unix/sysv/linux/internal_statvfs.c
+++ b/sysdeps/unix/sysv/linux/internal_statvfs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -19,8 +19,9 @@
 
   /* Now fill in the fields we have information for.  */
   buf->f_bsize = fsbuf.f_bsize;
-  /* Linux does not support f_frsize, so set it to the full block size.  */
-  buf->f_frsize = fsbuf.f_bsize;
+  /* Linux has the f_frsize size only in later version of the kernel.
+     If the value is not filled in use f_bsize.  */
+  buf->f_frsize = fsbuf.f_frsize ?: fsbuf.f_bsize;
   buf->f_blocks = fsbuf.f_blocks;
   buf->f_bfree = fsbuf.f_bfree;
   buf->f_bavail = fsbuf.f_bavail;