Skip to content

L
linux-davinci
Commit aa0dff2d authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files
Options

lib: percpu_counter_add 

 s/percpu_counter_mod/percpu_counter_add/

Because its a better name, _mod implies modulo.
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c4dc4bee
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
fs/ext2/balloc.c
View file @ aa0dff2d
...@@ -124,7 +124,7 @@ static int reserve_blocks(struct super_block *sb, int count) ...@@ -124,7 +124,7 @@ static int reserve_blocks(struct super_block *sb, int count)
return 0; return 0;
} }
percpu_counter_mod(&sbi->s_freeblocks_counter, -count); percpu_counter_add(&sbi->s_freeblocks_counter, -count);
sb->s_dirt = 1; sb->s_dirt = 1;
return count; return count;
} }
...@@ -134,7 +134,7 @@ static void release_blocks(struct super_block *sb, int count) ...@@ -134,7 +134,7 @@ static void release_blocks(struct super_block *sb, int count)
if (count) { if (count) {
struct ext2_sb_info *sbi = EXT2_SB(sb); struct ext2_sb_info *sbi = EXT2_SB(sb);
percpu_counter_mod(&sbi->s_freeblocks_counter, count); percpu_counter_add(&sbi->s_freeblocks_counter, count);
sb->s_dirt = 1; sb->s_dirt = 1;
} }
} }
......
fs/ext2/ialloc.c
View file @ aa0dff2d
...@@ -542,7 +542,7 @@ got: ...@@ -542,7 +542,7 @@ got:
goto fail; goto fail;
} }
percpu_counter_mod(&sbi->s_freeinodes_counter, -1); percpu_counter_add(&sbi->s_freeinodes_counter, -1);
if (S_ISDIR(mode)) if (S_ISDIR(mode))
percpu_counter_inc(&sbi->s_dirs_counter); percpu_counter_inc(&sbi->s_dirs_counter);
......
fs/ext3/balloc.c
View file @ aa0dff2d
...@@ -570,7 +570,7 @@ do_more: ...@@ -570,7 +570,7 @@ do_more:
cpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) + cpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) +
group_freed); group_freed);
spin_unlock(sb_bgl_lock(sbi, block_group)); spin_unlock(sb_bgl_lock(sbi, block_group));
percpu_counter_mod(&sbi->s_freeblocks_counter, count); percpu_counter_add(&sbi->s_freeblocks_counter, count);
/* We dirtied the bitmap block */ /* We dirtied the bitmap block */
BUFFER_TRACE(bitmap_bh, "dirtied bitmap block"); BUFFER_TRACE(bitmap_bh, "dirtied bitmap block");
...@@ -1633,7 +1633,7 @@ allocated: ...@@ -1633,7 +1633,7 @@ allocated:
gdp->bg_free_blocks_count = gdp->bg_free_blocks_count =
cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)-num); cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)-num);
spin_unlock(sb_bgl_lock(sbi, group_no)); spin_unlock(sb_bgl_lock(sbi, group_no));
percpu_counter_mod(&sbi->s_freeblocks_counter, -num); percpu_counter_add(&sbi->s_freeblocks_counter, -num);
BUFFER_TRACE(gdp_bh, "journal_dirty_metadata for group descriptor"); BUFFER_TRACE(gdp_bh, "journal_dirty_metadata for group descriptor");
err = ext3_journal_dirty_metadata(handle, gdp_bh); err = ext3_journal_dirty_metadata(handle, gdp_bh);
......
fs/ext3/resize.c
View file @ aa0dff2d
...@@ -884,9 +884,9 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input) ...@@ -884,9 +884,9 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input)
input->reserved_blocks); input->reserved_blocks);
/* Update the free space counts */ /* Update the free space counts */
percpu_counter_mod(&sbi->s_freeblocks_counter, percpu_counter_add(&sbi->s_freeblocks_counter,
input->free_blocks_count); input->free_blocks_count);
percpu_counter_mod(&sbi->s_freeinodes_counter, percpu_counter_add(&sbi->s_freeinodes_counter,
EXT3_INODES_PER_GROUP(sb)); EXT3_INODES_PER_GROUP(sb));
ext3_journal_dirty_metadata(handle, sbi->s_sbh); ext3_journal_dirty_metadata(handle, sbi->s_sbh);
......
fs/ext4/balloc.c
View file @ aa0dff2d
...@@ -587,7 +587,7 @@ do_more: ...@@ -587,7 +587,7 @@ do_more:
cpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) + cpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) +
group_freed); group_freed);
spin_unlock(sb_bgl_lock(sbi, block_group)); spin_unlock(sb_bgl_lock(sbi, block_group));
percpu_counter_mod(&sbi->s_freeblocks_counter, count); percpu_counter_add(&sbi->s_freeblocks_counter, count);
/* We dirtied the bitmap block */ /* We dirtied the bitmap block */
BUFFER_TRACE(bitmap_bh, "dirtied bitmap block"); BUFFER_TRACE(bitmap_bh, "dirtied bitmap block");
...@@ -1647,7 +1647,7 @@ allocated: ...@@ -1647,7 +1647,7 @@ allocated:
gdp->bg_free_blocks_count = gdp->bg_free_blocks_count =
cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)-num); cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)-num);
spin_unlock(sb_bgl_lock(sbi, group_no)); spin_unlock(sb_bgl_lock(sbi, group_no));
percpu_counter_mod(&sbi->s_freeblocks_counter, -num); percpu_counter_add(&sbi->s_freeblocks_counter, -num);
BUFFER_TRACE(gdp_bh, "journal_dirty_metadata for group descriptor"); BUFFER_TRACE(gdp_bh, "journal_dirty_metadata for group descriptor");
err = ext4_journal_dirty_metadata(handle, gdp_bh); err = ext4_journal_dirty_metadata(handle, gdp_bh);
......
fs/ext4/resize.c
View file @ aa0dff2d
...@@ -893,9 +893,9 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) ...@@ -893,9 +893,9 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input)
input->reserved_blocks); input->reserved_blocks);
/* Update the free space counts */ /* Update the free space counts */
percpu_counter_mod(&sbi->s_freeblocks_counter, percpu_counter_add(&sbi->s_freeblocks_counter,
input->free_blocks_count); input->free_blocks_count);
percpu_counter_mod(&sbi->s_freeinodes_counter, percpu_counter_add(&sbi->s_freeinodes_counter,
EXT4_INODES_PER_GROUP(sb)); EXT4_INODES_PER_GROUP(sb));
ext4_journal_dirty_metadata(handle, sbi->s_sbh); ext4_journal_dirty_metadata(handle, sbi->s_sbh);
......
include/linux/percpu_counter.h
View file @ aa0dff2d
...@@ -32,7 +32,7 @@ struct percpu_counter { ...@@ -32,7 +32,7 @@ struct percpu_counter {
void percpu_counter_init(struct percpu_counter *fbc, s64 amount); void percpu_counter_init(struct percpu_counter *fbc, s64 amount);
void percpu_counter_destroy(struct percpu_counter *fbc); void percpu_counter_destroy(struct percpu_counter *fbc);
void percpu_counter_mod(struct percpu_counter *fbc, s32 amount); void percpu_counter_add(struct percpu_counter *fbc, s32 amount);
s64 percpu_counter_sum(struct percpu_counter *fbc); s64 percpu_counter_sum(struct percpu_counter *fbc);
static inline s64 percpu_counter_read(struct percpu_counter *fbc) static inline s64 percpu_counter_read(struct percpu_counter *fbc)
...@@ -71,7 +71,7 @@ static inline void percpu_counter_destroy(struct percpu_counter *fbc) ...@@ -71,7 +71,7 @@ static inline void percpu_counter_destroy(struct percpu_counter *fbc)
} }
static inline void static inline void
percpu_counter_mod(struct percpu_counter *fbc, s32 amount) percpu_counter_add(struct percpu_counter *fbc, s32 amount)
{ {
preempt_disable(); preempt_disable();
fbc->count += amount; fbc->count += amount;
...@@ -97,12 +97,12 @@ static inline s64 percpu_counter_sum(struct percpu_counter *fbc) ...@@ -97,12 +97,12 @@ static inline s64 percpu_counter_sum(struct percpu_counter *fbc)
static inline void percpu_counter_inc(struct percpu_counter *fbc) static inline void percpu_counter_inc(struct percpu_counter *fbc)
{ {
percpu_counter_mod(fbc, 1); percpu_counter_add(fbc, 1);
} }
static inline void percpu_counter_dec(struct percpu_counter *fbc) static inline void percpu_counter_dec(struct percpu_counter *fbc)
{ {
percpu_counter_mod(fbc, -1); percpu_counter_add(fbc, -1);
} }
#endif /* _LINUX_PERCPU_COUNTER_H */ #endif /* _LINUX_PERCPU_COUNTER_H */
lib/percpu_counter.c
View file @ aa0dff2d
...@@ -14,7 +14,7 @@ static LIST_HEAD(percpu_counters); ...@@ -14,7 +14,7 @@ static LIST_HEAD(percpu_counters);
static DEFINE_MUTEX(percpu_counters_lock); static DEFINE_MUTEX(percpu_counters_lock);
#endif #endif
void percpu_counter_mod(struct percpu_counter *fbc, s32 amount) void percpu_counter_add(struct percpu_counter *fbc, s32 amount)
{ {
long count; long count;
s32 *pcount; s32 *pcount;
...@@ -32,7 +32,7 @@ void percpu_counter_mod(struct percpu_counter *fbc, s32 amount) ...@@ -32,7 +32,7 @@ void percpu_counter_mod(struct percpu_counter *fbc, s32 amount)
} }
put_cpu(); put_cpu();
} }
EXPORT_SYMBOL(percpu_counter_mod); EXPORT_SYMBOL(percpu_counter_add);
/* /*
* Add up all the per-cpu counts, return the result. This is a more accurate * Add up all the per-cpu counts, return the result. This is a more accurate
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment