diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-05 17:10:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-05 17:10:52 -0400 |
| commit | 13efdbecc65ef6ec4028551fb223dea5c5e3143c (patch) | |
| tree | 634a2ce082abe3eb2a5defe0f1ddc2f3eb10f085 /mm/hugetlb.c | |
| parent | 61f4a10cb4e9447a85245c63b3e7f46e09299fed (diff) | |
| parent | 6fd210a9cc398ecbff7bcdbe220651b73b654f56 (diff) | |
Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-stable
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index d0351e31f474..cafdcee154e8 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -2370,7 +2370,7 @@ void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed) | |||
| 2370 | long chg = region_truncate(&inode->i_mapping->private_list, offset); | 2370 | long chg = region_truncate(&inode->i_mapping->private_list, offset); |
| 2371 | 2371 | ||
| 2372 | spin_lock(&inode->i_lock); | 2372 | spin_lock(&inode->i_lock); |
| 2373 | inode->i_blocks -= blocks_per_huge_page(h); | 2373 | inode->i_blocks -= (blocks_per_huge_page(h) * freed); |
| 2374 | spin_unlock(&inode->i_lock); | 2374 | spin_unlock(&inode->i_lock); |
| 2375 | 2375 | ||
| 2376 | hugetlb_put_quota(inode->i_mapping, (chg - freed)); | 2376 | hugetlb_put_quota(inode->i_mapping, (chg - freed)); |