aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAdam Litke <agl@us.ibm.com>2007-11-14 19:59:41 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-14 21:45:40 -0500
commit9a119c056dc2a9970901954a6d561d50a95e528d (patch)
tree22ca1f97f18f8a788757825bd4623d52d97a5abb /fs
parent2fc39cec6a9b5b41727d3386b780b69422a15152 (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 'fs')
-rw-r--r--fs/hugetlbfs/inode.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 6513f5655861..09ee07f02663 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -858,15 +858,15 @@ out_free:
858 return -ENOMEM; 858 return -ENOMEM;
859} 859}
860 860
861int hugetlb_get_quota(struct address_space *mapping) 861int hugetlb_get_quota(struct address_space *mapping, long delta)
862{ 862{
863 int ret = 0; 863 int ret = 0;
864 struct hugetlbfs_sb_info *sbinfo = HUGETLBFS_SB(mapping->host->i_sb); 864 struct hugetlbfs_sb_info *sbinfo = HUGETLBFS_SB(mapping->host->i_sb);
865 865
866 if (sbinfo->free_blocks > -1) { 866 if (sbinfo->free_blocks > -1) {
867 spin_lock(&sbinfo->stat_lock); 867 spin_lock(&sbinfo->stat_lock);
868 if (sbinfo->free_blocks > 0) 868 if (sbinfo->free_blocks - delta >= 0)
869 sbinfo->free_blocks--; 869 sbinfo->free_blocks -= delta;
870 else 870 else
871 ret = -ENOMEM; 871 ret = -ENOMEM;
872 spin_unlock(&sbinfo->stat_lock); 872 spin_unlock(&sbinfo->stat_lock);
@@ -875,13 +875,13 @@ int hugetlb_get_quota(struct address_space *mapping)
875 return ret; 875 return ret;
876} 876}
877 877
878void hugetlb_put_quota(struct address_space *mapping) 878void hugetlb_put_quota(struct address_space *mapping, long delta)
879{ 879{
880 struct hugetlbfs_sb_info *sbinfo = HUGETLBFS_SB(mapping->host->i_sb); 880 struct hugetlbfs_sb_info *sbinfo = HUGETLBFS_SB(mapping->host->i_sb);
881 881
882 if (sbinfo->free_blocks > -1) { 882 if (sbinfo->free_blocks > -1) {
883 spin_lock(&sbinfo->stat_lock); 883 spin_lock(&sbinfo->stat_lock);
884 sbinfo->free_blocks++; 884 sbinfo->free_blocks += delta;
885 spin_unlock(&sbinfo->stat_lock); 885 spin_unlock(&sbinfo->stat_lock);
886 } 886 }
887} 887}