Commit 74a8a65c authored Nov 21, 2005 by David Gibson Committed by Linus Torvalds Nov 22, 2005

[PATCH] Fix hugetlbfs_statfs() reporting of block limits

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

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 86e07ce7

fs/hugetlbfs/inode.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -512,10 +512,14 @@ static int hugetlbfs_statfs(struct super_block sb, struct kstatfs buf)
		buf->f_bsize = HPAGE_SIZE;
		if (sbinfo) {
		spin_lock(&sbinfo->stat_lock);
		/* 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;

Admin message