2 files changed, 12 insertions, 0 deletions

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 8104e5af75ab..24968790bc3e 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -168,6 +168,8 @@ struct file *hugetlb_file_setup(const char *name, size_t);
 int hugetlb_get_quota(struct address_space *mapping, long delta);
 void hugetlb_put_quota(struct address_space *mapping, long delta);
 
+#define BLOCKS_PER_HUGEPAGE     (HPAGE_SIZE / 512)
+
 static inline int is_file_hugepages(struct file *file)
 {
         if (file->f_op == &hugetlbfs_file_operations)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index abe1e9f2a942..6121b57bbe96 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -801,6 +801,7 @@ retry:
 
                 if (vma->vm_flags & VM_SHARED) {
                         int err;
+                        struct inode *inode = mapping->host;
 
                         err = add_to_page_cache(page, mapping, idx, GFP_KERNEL);
                         if (err) {
@@ -809,6 +810,10 @@ retry:
                                         goto retry;
                                 goto out;
                         }
+
+                        spin_lock(&inode->i_lock);
+                        inode->i_blocks += BLOCKS_PER_HUGEPAGE;
+                        spin_unlock(&inode->i_lock);
                 } else
                         lock_page(page);
         }
@@ -1160,6 +1165,11 @@ int hugetlb_reserve_pages(struct inode *inode, long from, long to)
 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_HUGEPAGE * freed;
+        spin_unlock(&inode->i_lock);
+
         hugetlb_put_quota(inode->i_mapping, (chg - freed));
         hugetlb_acct_memory(-(chg - freed));
 }