[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4A54F771.3060908@sandeen.net>
Date: Wed, 08 Jul 2009 14:45:53 -0500
From: Eric Sandeen <sandeen@...deen.net>
To: linux-kernel Mailing List <linux-kernel@...r.kernel.org>
CC: Andi Kleen <andi@...stfloor.org>,
William Lee Irwin III <wli@...omorphy.com>
Subject: [PATCH] hugetlbfs: fix i_blocks accounting
As reported in Red Hat bz #509671, i_blocks for files on hugetlbfs
get accounting wrong when doing something like:
$ > foo
$ date > foo
date: write error: Invalid argument
$ /usr/bin/stat foo
File: `foo'
Size: 0 Blocks: 18446744073709547520 IO Block: 2097152 regular
...
This is because hugetlb_unreserve_pages() is unconditionally
removing blocks_per_huge_page(h) on each call rather than using
the freed amount. If there were 0 blocks, it goes negative,
resulting in the above.
This is a regression from commit
a5516438959d90b071ff0a484ce4f3f523dc3152
which did:
- inode->i_blocks -= BLOCKS_PER_HUGEPAGE * freed;
+ inode->i_blocks -= blocks_per_huge_page(h);
so just put back the freed multiplier, and it's all happy again.
Signed-off-by: Eric Sandeen <sandeen@...hat.com>
Cc: Andi Kleen <andi@...stfloor.org>
Cc: William Lee Irwin III <wli@...omorphy.com>
---
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index d0351e3..cafdcee 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2370,7 +2370,7 @@ void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed)
long chg = region_truncate(&inode->i_mapping->private_list, offset);
spin_lock(&inode->i_lock);
- inode->i_blocks -= blocks_per_huge_page(h);
+ inode->i_blocks -= (blocks_per_huge_page(h) * freed);
spin_unlock(&inode->i_lock);
hugetlb_put_quota(inode->i_mapping, (chg - freed));
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists