Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f031dd27 authored by Joonsoo Kim's avatar Joonsoo Kim Committed by Linus Torvalds
Browse files

mm, hugetlb: remove resv_map_put 



This is a preparation patch to unify the use of vma_resv_map()
regardless of the map type.  This patch prepares it by removing
resv_map_put(), which only works for HPAGE_RESV_OWNER's resv_map, not
for all resv_maps.

[davidlohr@hp.com: update changelog]
Signed-off-by: default avatarJoonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: default avatarDavidlohr Bueso <davidlohr@hp.com>
Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Reviewed-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7b24d861

mm/hugetlb.c

+3 −12
Original line number Diff line number Diff line
@@ -2275,15 +2275,6 @@ static void hugetlb_vm_op_open(struct vm_area_struct *vma) 
		kref_get(&resv->refs);

}



static void resv_map_put(struct vm_area_struct *vma)

{

	struct resv_map *resv = vma_resv_map(vma);



	if (!resv)

		return;

	kref_put(&resv->refs, resv_map_release);

}



static void hugetlb_vm_op_close(struct vm_area_struct *vma)

{

	struct hstate *h = hstate_vma(vma);
@@ -2300,7 +2291,7 @@ static void hugetlb_vm_op_close(struct vm_area_struct *vma) 
		reserve = (end - start) -

			region_count(resv, start, end);



		resv_map_put(vma);

		kref_put(&resv->refs, resv_map_release);



		if (reserve) {

			hugetlb_acct_memory(h, -reserve);
@@ -3249,8 +3240,8 @@ int hugetlb_reserve_pages(struct inode *inode, 
		region_add(resv_map, from, to);

	return 0;

out_err:

	if (vma)

		resv_map_put(vma);

	if (vma && is_vma_resv_set(vma, HPAGE_RESV_OWNER))

		kref_put(&resv_map->refs, resv_map_release);

	return ret;

}