diff options
author | Adam Litke <agl@us.ibm.com> | 2007-11-14 19:59:41 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-14 21:45:40 -0500 |
commit | 9a119c056dc2a9970901954a6d561d50a95e528d (patch) | |
tree | 22ca1f97f18f8a788757825bd4623d52d97a5abb /mm/hugetlb.c | |
parent | 2fc39cec6a9b5b41727d3386b780b69422a15152 (diff) |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index bc12b0adfa8..1e317465ecd 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -132,7 +132,7 @@ static void free_huge_page(struct page *page) | |||
132 | } | 132 | } |
133 | spin_unlock(&hugetlb_lock); | 133 | spin_unlock(&hugetlb_lock); |
134 | if (mapping) | 134 | if (mapping) |
135 | hugetlb_put_quota(mapping); | 135 | hugetlb_put_quota(mapping, 1); |
136 | set_page_private(page, 0); | 136 | set_page_private(page, 0); |
137 | } | 137 | } |
138 | 138 | ||
@@ -390,7 +390,7 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma, | |||
390 | struct page *page; | 390 | struct page *page; |
391 | struct address_space *mapping = vma->vm_file->f_mapping; | 391 | struct address_space *mapping = vma->vm_file->f_mapping; |
392 | 392 | ||
393 | if (hugetlb_get_quota(mapping)) | 393 | if (hugetlb_get_quota(mapping, 1)) |
394 | return ERR_PTR(-VM_FAULT_SIGBUS); | 394 | return ERR_PTR(-VM_FAULT_SIGBUS); |
395 | 395 | ||
396 | if (vma->vm_flags & VM_MAYSHARE) | 396 | if (vma->vm_flags & VM_MAYSHARE) |