summaryrefslogtreecommitdiffstats
path: root/mm/hugetlb.c
diff options
context:
space:
mode:
authorAdam Litke <agl@us.ibm.com>2007-11-14 16:59:41 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-14 18:45:40 -0800
commit9a119c056dc2a9970901954a6d561d50a95e528d (patch)
tree22ca1f97f18f8a788757825bd4623d52d97a5abb /mm/hugetlb.c
parent2fc39cec6a9b5b41727d3386b780b69422a15152 (diff)
downloadlinux-9a119c056dc2a9970901954a6d561d50a95e528d.tar.gz
linux-9a119c056dc2a9970901954a6d561d50a95e528d.tar.bz2
linux-9a119c056dc2a9970901954a6d561d50a95e528d.zip
hugetlb: allow bulk updating in hugetlb_*_quota()
Add a second parameter 'delta' to hugetlb_get_quota and hugetlb_put_quota to allow bulk updating of the sbinfo->free_blocks counter. This will be used by the next patch in the series. Signed-off-by: Adam Litke <agl@us.ibm.com> Cc: Ken Chen <kenchen@google.com> Cc: Andy Whitcroft <apw@shadowen.org> Cc: Dave Hansen <haveblue@us.ibm.com> Cc: David Gibson <hermes@gibson.dropbear.id.au> Cc: William Lee Irwin III <wli@holomorphy.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r--mm/hugetlb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index bc12b0adfa87..1e317465ecd1 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -132,7 +132,7 @@ static void free_huge_page(struct page *page)
}
spin_unlock(&hugetlb_lock);
if (mapping)
- hugetlb_put_quota(mapping);
+ hugetlb_put_quota(mapping, 1);
set_page_private(page, 0);
}
@@ -390,7 +390,7 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma,
struct page *page;
struct address_space *mapping = vma->vm_file->f_mapping;
- if (hugetlb_get_quota(mapping))
+ if (hugetlb_get_quota(mapping, 1))
return ERR_PTR(-VM_FAULT_SIGBUS);
if (vma->vm_flags & VM_MAYSHARE)