From 0121d687a83e8ed2539dd2440c5b36d8c617a651 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@sandeen.net>
Date: Wed, 29 Jul 2009 15:02:16 -0700
Subject: [PATCH] --- yaml --- r: 156041 b: refs/heads/master c:
 e4c6f8bed01f9f9a5c607bd689bf67e7b8a36bd8 h: refs/heads/master i:   156039:
 ccb5b3e050623f705d402768be1773c975ea4cba v: v3

---
 [refs]             | 2 +-
 trunk/mm/hugetlb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 37b365002f75..781424d1bb9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 659098141d02eb8e3545be8969d262e02d2f3f98
+refs/heads/master: e4c6f8bed01f9f9a5c607bd689bf67e7b8a36bd8
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index d0351e31f474..cafdcee154e8 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/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));