Merge ../scsi-rc-fixes-2.6

1 files changed, 23 insertions, 2 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 1d709ff528e1..a088f593a807 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -356,8 +356,8 @@ nomem:
         return -ENOMEM;
 }
 
-void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,
-                          unsigned long end)
+void __unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,
+                            unsigned long end)
 {
         struct mm_struct *mm = vma->vm_mm;
         unsigned long address;
@@ -398,6 +398,24 @@ void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,
         }
 }
 
+void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,
+                          unsigned long end)
+{
+        /*
+         * It is undesirable to test vma->vm_file as it should be non-null
+         * for valid hugetlb area. However, vm_file will be NULL in the error
+         * cleanup path of do_mmap_pgoff. When hugetlbfs ->mmap method fails,
+         * do_mmap_pgoff() nullifies vma->vm_file before calling this function
+         * to clean up. Since no pte has actually been setup, it is safe to
+         * do nothing in this case.
+         */
+        if (vma->vm_file) {
+                spin_lock(&vma->vm_file->f_mapping->i_mmap_lock);
+                __unmap_hugepage_range(vma, start, end);
+                spin_unlock(&vma->vm_file->f_mapping->i_mmap_lock);
+        }
+}
+
 static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
                         unsigned long address, pte_t *ptep, pte_t pte)
 {
@@ -460,6 +478,9 @@ int hugetlb_no_page(struct mm_struct *mm, struct vm_area_struct *vma,
 retry:
         page = find_lock_page(mapping, idx);
         if (!page) {
+                size = i_size_read(mapping->host) >> HPAGE_SHIFT;
+                if (idx >= size)
+                        goto out;
                 if (hugetlb_get_quota(mapping))
                         goto out;
                 page = alloc_huge_page(vma, address);