[PATCH v2 11/20] mm, hugetlb: make vma_resv_map() works for all mapping type

[Joonsoo Kim]

Util now, we get a resv_map by two ways according to each mapping type.
This makes code dirty and unreadable. So unfiying it.

Signed-off-by: Joonsoo Kim <iamjoonsoo....@lge.com>

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 869c3e0..e6c0c77 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -421,13 +421,24 @@ void resv_map_release(struct kref *ref)
        kfree(resv_map);
 }
 
+static inline struct resv_map *inode_resv_map(struct inode *inode)
+{
+       return inode->i_mapping->private_data;
+}
+
 static struct resv_map *vma_resv_map(struct vm_area_struct *vma)
 {
        VM_BUG_ON(!is_vm_hugetlb_page(vma));
-       if (!(vma->vm_flags & VM_MAYSHARE))
+       if (vma->vm_flags & VM_MAYSHARE) {
+               struct address_space *mapping = vma->vm_file->f_mapping;
+               struct inode *inode = mapping->host;
+
+               return inode_resv_map(inode);
+
+       } else {
                return (struct resv_map *)(get_vma_private_data(vma) &
                                                        ~HPAGE_RESV_MASK);
-       return NULL;
+       }
 }
 
 static void set_vma_resv_map(struct vm_area_struct *vma, struct resv_map *map)
@@ -1107,44 +1118,31 @@ static void return_unused_surplus_pages(struct hstate 
*h,
 static long vma_needs_reservation(struct hstate *h,
                        struct vm_area_struct *vma, unsigned long addr)
 {
-       struct address_space *mapping = vma->vm_file->f_mapping;
-       struct inode *inode = mapping->host;
-
-       if (vma->vm_flags & VM_MAYSHARE) {
-               pgoff_t idx = vma_hugecache_offset(h, vma, addr);
-               struct resv_map *resv = inode->i_mapping->private_data;
-
-               return region_chg(&resv->regions, idx, idx + 1);
+       struct resv_map *resv;
+       pgoff_t idx;
+       long chg;
 
-       } else if (!is_vma_resv_set(vma, HPAGE_RESV_OWNER)) {
+       resv = vma_resv_map(vma);
+       if (!resv)
                return 1;
 
-       } else  {
-               long err;
-               pgoff_t idx = vma_hugecache_offset(h, vma, addr);
-               struct resv_map *resv = vma_resv_map(vma);
+       idx = vma_hugecache_offset(h, vma, addr);
+       chg = region_chg(resv, idx, idx + 1);
 
-               err = region_chg(resv, idx, idx + 1);
-               if (err < 0)
-                       return err;
-               return 0;
-       }
+       if (vma->vm_flags & VM_MAYSHARE)
+               return chg;
+       else
+               return chg < 0 ? chg : 0;
 }
 static void vma_commit_reservation(struct hstate *h,
                        struct vm_area_struct *vma, unsigned long addr)
 {
-       struct address_space *mapping = vma->vm_file->f_mapping;
-       struct inode *inode = mapping->host;
-
-       if (vma->vm_flags & VM_MAYSHARE) {
-               pgoff_t idx = vma_hugecache_offset(h, vma, addr);
-               struct resv_map *resv = inode->i_mapping->private_data;
-
-               region_add(&resv->regions, idx, idx + 1);
+       struct resv_map *resv;
+       pgoff_t idx;
 
-       } else if (is_vma_resv_set(vma, HPAGE_RESV_OWNER)) {
-               pgoff_t idx = vma_hugecache_offset(h, vma, addr);
-               struct resv_map *resv = vma_resv_map(vma);
+       resv = vma_resv_map(vma);
+       if (!resv)
+               return;
 
        idx = vma_hugecache_offset(h, vma, addr);
        region_add(resv, idx, idx + 1);
@@ -2208,7 +2206,7 @@ static void hugetlb_vm_op_open(struct vm_area_struct *vma)
         * after this open call completes.  It is therefore safe to take a
         * new reference here without additional locking.
         */
-       if (resv)
+       if (resv && is_vma_resv_set(vma, HPAGE_RESV_OWNER))
                kref_get(&resv->refs);
 }
 
@@ -2221,7 +2219,10 @@ static void hugetlb_vm_op_close(struct vm_area_struct 
*vma)
        unsigned long start;
        unsigned long end;
 
-       if (resv) {
+       if (!resv)
+               return;
+
+       if (is_vma_resv_set(vma, HPAGE_RESV_OWNER)) {
                start = vma_hugecache_offset(h, vma, vma->vm_start);
                end = vma_hugecache_offset(h, vma, vma->vm_end);
 
@@ -3104,7 +3105,7 @@ int hugetlb_reserve_pages(struct inode *inode,
         * called to make the mapping read-write. Assume !vma is a shm mapping
         */
        if (!vma || vma->vm_flags & VM_MAYSHARE) {
-               resv_map = inode->i_mapping->private_data;
+               resv_map = inode_resv_map(inode);
 
                chg = region_chg(resv_map, from, to);
 
@@ -3163,7 +3164,7 @@ out_err:
 void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed)
 {
        struct hstate *h = hstate_inode(inode);
-       struct resv_map *resv_map = inode->i_mapping->private_data;
+       struct resv_map *resv_map = inode_resv_map(inode);
        long chg = 0;
        struct hugepage_subpool *spool = subpool_inode(inode);
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/