percpu counter: clean up percpu_counter_sum_and_set()

percpu_counter_sum_and_set() and percpu_counter_sum() is the same except
the former updates the global counter after accounting.  Since we are
taking the fbc->lock to calculate the precise value of the counter in
percpu_counter_sum() anyway, it should simply set fbc->count too, as the
percpu_counter_sum_and_set() does.

This patch merges these two interfaces into one.
 
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index e9fa960ba6d..00a94d5866c 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -1624,7 +1624,7 @@ ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi,
 #ifdef CONFIG_SMP
         if (free_blocks - root_blocks < FBC_BATCH)
                 free_blocks =
-                        percpu_counter_sum_and_set(&sbi->s_freeblocks_counter);
+                        percpu_counter_sum(&sbi->s_freeblocks_counter);
 #endif
         if (free_blocks <= root_blocks)
                 /* we don't have free space */