hugetlbfs: fix i_blocks accounting
Subsystems (2)
PATCH 1/1 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 commita5516438959d90b071ff0a484ce4f3f523dc3152
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 <[email protected]>
Cc Andi Kleen <[email protected]>
Cc William Lee Irwin III <[email protected]>
---
mm/hugetlb.c +1 -1
@@ -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));
Quoted 6 lines
which did:
(quoted diff) +1
-1- 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.
Thanks looks good. Silly typo.
Acked-by Andi Kleen <[email protected]>
-Andi
Signature · 1 line
[email protected] -- Speaking for myself only.