aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ext2/balloc.c4
-rw-r--r--fs/ext2/ialloc.c2
-rw-r--r--fs/ext3/balloc.c4
-rw-r--r--fs/ext3/resize.c4
-rw-r--r--fs/ext4/balloc.c4
-rw-r--r--fs/ext4/resize.c4
-rw-r--r--include/linux/percpu_counter.h8
-rw-r--r--lib/percpu_counter.c4
8 files changed, 17 insertions, 17 deletions
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index baf71dd721fa..53be25158560 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -124,7 +124,7 @@ static int reserve_blocks(struct super_block *sb, int count)
124 return 0; 124 return 0;
125 } 125 }
126 126
127 percpu_counter_mod(&sbi->s_freeblocks_counter, -count); 127 percpu_counter_add(&sbi->s_freeblocks_counter, -count);
128 sb->s_dirt = 1; 128 sb->s_dirt = 1;
129 return count; 129 return count;
130} 130}
@@ -134,7 +134,7 @@ static void release_blocks(struct super_block *sb, int count)
134 if (count) { 134 if (count) {
135 struct ext2_sb_info *sbi = EXT2_SB(sb); 135 struct ext2_sb_info *sbi = EXT2_SB(sb);
136 136
137 percpu_counter_mod(&sbi->s_freeblocks_counter, count); 137 percpu_counter_add(&sbi->s_freeblocks_counter, count);
138 sb->s_dirt = 1; 138 sb->s_dirt = 1;
139 } 139 }
140} 140}
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index 2cb545bf0f3c..4a9746b9afb7 100644
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -542,7 +542,7 @@ got:
542 goto fail; 542 goto fail;
543 } 543 }
544 544
545 percpu_counter_mod(&sbi->s_freeinodes_counter, -1); 545 percpu_counter_add(&sbi->s_freeinodes_counter, -1);
546 if (S_ISDIR(mode)) 546 if (S_ISDIR(mode))
547 percpu_counter_inc(&sbi->s_dirs_counter); 547 percpu_counter_inc(&sbi->s_dirs_counter);
548 548
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index ca8aee6efe37..df575673e02d 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -570,7 +570,7 @@ do_more:
570 cpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) + 570 cpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) +
571 group_freed); 571 group_freed);
572 spin_unlock(sb_bgl_lock(sbi, block_group)); 572 spin_unlock(sb_bgl_lock(sbi, block_group));
573 percpu_counter_mod(&sbi->s_freeblocks_counter, count); 573 percpu_counter_add(&sbi->s_freeblocks_counter, count);
574 574
575 /* We dirtied the bitmap block */ 575 /* We dirtied the bitmap block */
576 BUFFER_TRACE(bitmap_bh, "dirtied bitmap block"); 576 BUFFER_TRACE(bitmap_bh, "dirtied bitmap block");
@@ -1633,7 +1633,7 @@ allocated:
1633 gdp->bg_free_blocks_count = 1633 gdp->bg_free_blocks_count =
1634 cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)-num); 1634 cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)-num);
1635 spin_unlock(sb_bgl_lock(sbi, group_no)); 1635 spin_unlock(sb_bgl_lock(sbi, group_no));
1636 percpu_counter_mod(&sbi->s_freeblocks_counter, -num); 1636 percpu_counter_add(&sbi->s_freeblocks_counter, -num);
1637 1637
1638 BUFFER_TRACE(gdp_bh, "journal_dirty_metadata for group descriptor"); 1638 BUFFER_TRACE(gdp_bh, "journal_dirty_metadata for group descriptor");
1639 err = ext3_journal_dirty_metadata(handle, gdp_bh); 1639 err = ext3_journal_dirty_metadata(handle, gdp_bh);
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
index 2c97e09c6c6b..a4693c0428be 100644
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
@@ -884,9 +884,9 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input)
884 input->reserved_blocks); 884 input->reserved_blocks);
885 885
886 /* Update the free space counts */ 886 /* Update the free space counts */
887 percpu_counter_mod(&sbi->s_freeblocks_counter, 887 percpu_counter_add(&sbi->s_freeblocks_counter,
888 input->free_blocks_count); 888 input->free_blocks_count);
889 percpu_counter_mod(&sbi->s_freeinodes_counter, 889 percpu_counter_add(&sbi->s_freeinodes_counter,
890 EXT3_INODES_PER_GROUP(sb)); 890 EXT3_INODES_PER_GROUP(sb));
891 891
892 ext3_journal_dirty_metadata(handle, sbi->s_sbh); 892 ext3_journal_dirty_metadata(handle, sbi->s_sbh);
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index e53b4af52f11..a141456cd491 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -587,7 +587,7 @@ do_more:
587 cpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) + 587 cpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) +
588 group_freed); 588 group_freed);
589 spin_unlock(sb_bgl_lock(sbi, block_group)); 589 spin_unlock(sb_bgl_lock(sbi, block_group));
590 percpu_counter_mod(&sbi->s_freeblocks_counter, count); 590 percpu_counter_add(&sbi->s_freeblocks_counter, count);
591 591
592 /* We dirtied the bitmap block */ 592 /* We dirtied the bitmap block */
593 BUFFER_TRACE(bitmap_bh, "dirtied bitmap block"); 593 BUFFER_TRACE(bitmap_bh, "dirtied bitmap block");
@@ -1647,7 +1647,7 @@ allocated:
1647 gdp->bg_free_blocks_count = 1647 gdp->bg_free_blocks_count =
1648 cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)-num); 1648 cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)-num);
1649 spin_unlock(sb_bgl_lock(sbi, group_no)); 1649 spin_unlock(sb_bgl_lock(sbi, group_no));
1650 percpu_counter_mod(&sbi->s_freeblocks_counter, -num); 1650 percpu_counter_add(&sbi->s_freeblocks_counter, -num);
1651 1651
1652 BUFFER_TRACE(gdp_bh, "journal_dirty_metadata for group descriptor"); 1652 BUFFER_TRACE(gdp_bh, "journal_dirty_metadata for group descriptor");
1653 err = ext4_journal_dirty_metadata(handle, gdp_bh); 1653 err = ext4_journal_dirty_metadata(handle, gdp_bh);
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index aa11d7dbe970..472fc0d3e1c0 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -893,9 +893,9 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input)
893 input->reserved_blocks); 893 input->reserved_blocks);
894 894
895 /* Update the free space counts */ 895 /* Update the free space counts */
896 percpu_counter_mod(&sbi->s_freeblocks_counter, 896 percpu_counter_add(&sbi->s_freeblocks_counter,
897 input->free_blocks_count); 897 input->free_blocks_count);
898 percpu_counter_mod(&sbi->s_freeinodes_counter, 898 percpu_counter_add(&sbi->s_freeinodes_counter,
899 EXT4_INODES_PER_GROUP(sb)); 899 EXT4_INODES_PER_GROUP(sb));
900 900
901 ext4_journal_dirty_metadata(handle, sbi->s_sbh); 901 ext4_journal_dirty_metadata(handle, sbi->s_sbh);
diff --git a/include/linux/percpu_counter.h b/include/linux/percpu_counter.h
index 3d9f70972cdf..b84fc8667de8 100644
--- a/include/linux/percpu_counter.h
+++ b/include/linux/percpu_counter.h
@@ -32,7 +32,7 @@ struct percpu_counter {
32 32
33void percpu_counter_init(struct percpu_counter *fbc, s64 amount); 33void percpu_counter_init(struct percpu_counter *fbc, s64 amount);
34void percpu_counter_destroy(struct percpu_counter *fbc); 34void percpu_counter_destroy(struct percpu_counter *fbc);
35void percpu_counter_mod(struct percpu_counter *fbc, s32 amount); 35void percpu_counter_add(struct percpu_counter *fbc, s32 amount);
36s64 percpu_counter_sum(struct percpu_counter *fbc); 36s64 percpu_counter_sum(struct percpu_counter *fbc);
37 37
38static inline s64 percpu_counter_read(struct percpu_counter *fbc) 38static inline s64 percpu_counter_read(struct percpu_counter *fbc)
@@ -71,7 +71,7 @@ static inline void percpu_counter_destroy(struct percpu_counter *fbc)
71} 71}
72 72
73static inline void 73static inline void
74percpu_counter_mod(struct percpu_counter *fbc, s32 amount) 74percpu_counter_add(struct percpu_counter *fbc, s32 amount)
75{ 75{
76 preempt_disable(); 76 preempt_disable();
77 fbc->count += amount; 77 fbc->count += amount;
@@ -97,12 +97,12 @@ static inline s64 percpu_counter_sum(struct percpu_counter *fbc)
97 97
98static inline void percpu_counter_inc(struct percpu_counter *fbc) 98static inline void percpu_counter_inc(struct percpu_counter *fbc)
99{ 99{
100 percpu_counter_mod(fbc, 1); 100 percpu_counter_add(fbc, 1);
101} 101}
102 102
103static inline void percpu_counter_dec(struct percpu_counter *fbc) 103static inline void percpu_counter_dec(struct percpu_counter *fbc)
104{ 104{
105 percpu_counter_mod(fbc, -1); 105 percpu_counter_add(fbc, -1);
106} 106}
107 107
108#endif /* _LINUX_PERCPU_COUNTER_H */ 108#endif /* _LINUX_PERCPU_COUNTER_H */
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index cf22c617baa4..5f36ad79a24a 100644
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -14,7 +14,7 @@ static LIST_HEAD(percpu_counters);
14static DEFINE_MUTEX(percpu_counters_lock); 14static DEFINE_MUTEX(percpu_counters_lock);
15#endif 15#endif
16 16
17void percpu_counter_mod(struct percpu_counter *fbc, s32 amount) 17void percpu_counter_add(struct percpu_counter *fbc, s32 amount)
18{ 18{
19 long count; 19 long count;
20 s32 *pcount; 20 s32 *pcount;
@@ -32,7 +32,7 @@ void percpu_counter_mod(struct percpu_counter *fbc, s32 amount)
32 } 32 }
33 put_cpu(); 33 put_cpu();
34} 34}
35EXPORT_SYMBOL(percpu_counter_mod); 35EXPORT_SYMBOL(percpu_counter_add);
36 36
37/* 37/*
38 * Add up all the per-cpu counts, return the result. This is a more accurate 38 * Add up all the per-cpu counts, return the result. This is a more accurate