Andrew, please apply.
Currently, if a hugetlbfs is mounted without limits (the default),
statfs() will return -1 for max/free/used blocks. This does not
appear to be in line with normal convention: simple_statfs() and
shmem_statfs() both return 0 in similar cases. Worse, it confuses the
translation logic in put_compat_statfs(), causing it to return
-EOVERFLOW on such a mount.
This patch alters hugetlbfs_statfs() to return 0 for max/free/used
blocks on a mount without limits. Note that we need the test in the
patch below, rather than just using 0 in the sbinfo structure, because
the -1 marked in the free blocks field is used internally to tell the
difference between a full filesystem and one with no limit.
Signed-off-by: David Gibson <[email protected]>
Index: working-2.6/fs/hugetlbfs/inode.c
===================================================================
--- working-2.6.orig/fs/hugetlbfs/inode.c 2005-11-18 14:06:55.000000000 +1100
+++ working-2.6/fs/hugetlbfs/inode.c 2005-11-18 14:28:27.000000000 +1100
@@ -509,10 +509,14 @@
buf->f_bsize = HPAGE_SIZE;
if (sbinfo) {
spin_lock(&sbinfo->stat_lock);
- buf->f_blocks = sbinfo->max_blocks;
- buf->f_bavail = buf->f_bfree = sbinfo->free_blocks;
- buf->f_files = sbinfo->max_inodes;
- buf->f_ffree = sbinfo->free_inodes;
+ /* If no limits set, just report 0 for max/free/used
+ * blocks, like simple_statfs() */
+ if (sbinfo->max_blocks >= 0) {
+ buf->f_blocks = sbinfo->max_blocks;
+ buf->f_bavail = buf->f_bfree = sbinfo->free_blocks;
+ buf->f_files = sbinfo->max_inodes;
+ buf->f_ffree = sbinfo->free_inodes;
+ }
spin_unlock(&sbinfo->stat_lock);
}
buf->f_namelen = NAME_MAX;
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
----- End forwarded message -----
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson