1 files changed, 26 insertions, 8 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index ae8f708e3d75..e198831276a3 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -273,8 +273,8 @@ static long region_count(struct list_head *head, long f, long t)
 
         /* Locate each segment we overlap with, and count that overlap. */
         list_for_each_entry(rg, head, link) {
-                int seg_from;
-                int seg_to;
+                long seg_from;
+                long seg_to;
 
                 if (rg->to <= f)
                         continue;
@@ -2157,6 +2157,15 @@ static void hugetlb_vm_op_open(struct vm_area_struct *vma)
                 kref_get(&reservations->refs);
 }
 
+static void resv_map_put(struct vm_area_struct *vma)
+{
+        struct resv_map *reservations = vma_resv_map(vma);
+
+        if (!reservations)
+                return;
+        kref_put(&reservations->refs, resv_map_release);
+}
+
 static void hugetlb_vm_op_close(struct vm_area_struct *vma)
 {
         struct hstate *h = hstate_vma(vma);
@@ -2173,7 +2182,7 @@ static void hugetlb_vm_op_close(struct vm_area_struct *vma)
                 reserve = (end - start) -
                         region_count(&reservations->regions, start, end);
 
-                kref_put(&reservations->refs, resv_map_release);
+                resv_map_put(vma);
 
                 if (reserve) {
                         hugetlb_acct_memory(h, -reserve);
@@ -2213,6 +2222,7 @@ static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page,
         }
         entry = pte_mkyoung(entry);
         entry = pte_mkhuge(entry);
+        entry = arch_make_huge_pte(entry, vma, page, writable);
 
         return entry;
 }
@@ -2990,12 +3000,16 @@ int hugetlb_reserve_pages(struct inode *inode,
                 set_vma_resv_flags(vma, HPAGE_RESV_OWNER);
         }
 
-        if (chg < 0)
-                return chg;
+        if (chg < 0) {
+                ret = chg;
+                goto out_err;
+        }
 
         /* There must be enough pages in the subpool for the mapping */
-        if (hugepage_subpool_get_pages(spool, chg))
-                return -ENOSPC;
+        if (hugepage_subpool_get_pages(spool, chg)) {
+                ret = -ENOSPC;
+                goto out_err;
+        }
 
         /*
          * Check enough hugepages are available for the reservation.
@@ -3004,7 +3018,7 @@ int hugetlb_reserve_pages(struct inode *inode,
         ret = hugetlb_acct_memory(h, chg);
         if (ret < 0) {
                 hugepage_subpool_put_pages(spool, chg);
-                return ret;
+                goto out_err;
         }
 
         /*
@@ -3021,6 +3035,10 @@ int hugetlb_reserve_pages(struct inode *inode,
         if (!vma || vma->vm_flags & VM_MAYSHARE)
                 region_add(&inode->i_mapping->private_list, from, to);
         return 0;
+out_err:
+        if (vma)
+                resv_map_put(vma);
+        return ret;
 }
 
 void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed)