leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocfs2: use bitmap_weight()

Browse Source 
Use bitmap_weight() instead of reinventing the wheel.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Akinobu Mita 2013-11-12 15:06:58 -08:00 committed by Linus Torvalds
parent 910bffe086
commit a8f70de37b
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/ocfs2/cluster/heartbeat.c
View File

@ -35,6 +35,7 @@
#include <linux/time.h> #include <linux/time.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/bitmap.h>
#include "heartbeat.h" #include "heartbeat.h"
#include "tcp.h" #include "tcp.h"
@ -282,15 +283,6 @@ struct o2hb_bio_wait_ctxt {
int wc_error; int wc_error;
}; };
static int o2hb_pop_count(void *map, int count)
{
int i = -1, pop = 0;
while ((i = find_next_bit(map, count, i + 1)) < count)
pop++;
return pop;
}
static void o2hb_write_timeout(struct work_struct *work) static void o2hb_write_timeout(struct work_struct *work)
{ {
int failed, quorum; int failed, quorum;
@ -307,9 +299,9 @@ static void o2hb_write_timeout(struct work_struct *work)
spin_lock_irqsave(&o2hb_live_lock, flags); spin_lock_irqsave(&o2hb_live_lock, flags);
if (test_bit(reg->hr_region_num, o2hb_quorum_region_bitmap)) if (test_bit(reg->hr_region_num, o2hb_quorum_region_bitmap))
set_bit(reg->hr_region_num, o2hb_failed_region_bitmap); set_bit(reg->hr_region_num, o2hb_failed_region_bitmap);
failed = o2hb_pop_count(&o2hb_failed_region_bitmap, failed = bitmap_weight(o2hb_failed_region_bitmap,
O2NM_MAX_REGIONS); O2NM_MAX_REGIONS);
quorum = o2hb_pop_count(&o2hb_quorum_region_bitmap, quorum = bitmap_weight(o2hb_quorum_region_bitmap,
O2NM_MAX_REGIONS); O2NM_MAX_REGIONS);
spin_unlock_irqrestore(&o2hb_live_lock, flags); spin_unlock_irqrestore(&o2hb_live_lock, flags);
@ -765,7 +757,7 @@ static void o2hb_set_quorum_device(struct o2hb_region *reg)
* If global heartbeat active, unpin all regions if the * If global heartbeat active, unpin all regions if the
* region count > CUT_OFF * region count > CUT_OFF
*/ */
if (o2hb_pop_count(&o2hb_quorum_region_bitmap, if (bitmap_weight(o2hb_quorum_region_bitmap,
O2NM_MAX_REGIONS) > O2HB_PIN_CUT_OFF) O2NM_MAX_REGIONS) > O2HB_PIN_CUT_OFF)
o2hb_region_unpin(NULL); o2hb_region_unpin(NULL);
unlock: unlock:
@ -1829,7 +1821,7 @@ static ssize_t o2hb_region_dev_write(struct o2hb_region *reg,
live_threshold = O2HB_LIVE_THRESHOLD; live_threshold = O2HB_LIVE_THRESHOLD;
if (o2hb_global_heartbeat_active()) { if (o2hb_global_heartbeat_active()) {
spin_lock(&o2hb_live_lock); spin_lock(&o2hb_live_lock);
if (o2hb_pop_count(&o2hb_region_bitmap, O2NM_MAX_REGIONS) == 1) if (bitmap_weight(o2hb_region_bitmap, O2NM_MAX_REGIONS) == 1)
live_threshold <<= 1; live_threshold <<= 1;
spin_unlock(&o2hb_live_lock); spin_unlock(&o2hb_live_lock);
} }
@ -2180,7 +2172,7 @@ static void o2hb_heartbeat_group_drop_item(struct config_group *group,
if (!o2hb_dependent_users) if (!o2hb_dependent_users)
goto unlock; goto unlock;
if (o2hb_pop_count(&o2hb_quorum_region_bitmap, if (bitmap_weight(o2hb_quorum_region_bitmap,
O2NM_MAX_REGIONS) <= O2HB_PIN_CUT_OFF) O2NM_MAX_REGIONS) <= O2HB_PIN_CUT_OFF)
o2hb_region_pin(NULL); o2hb_region_pin(NULL);
@ -2480,7 +2472,7 @@ static int o2hb_region_inc_user(const char *region_uuid)
if (o2hb_dependent_users > 1) if (o2hb_dependent_users > 1)
goto unlock; goto unlock;
if (o2hb_pop_count(&o2hb_quorum_region_bitmap, if (bitmap_weight(o2hb_quorum_region_bitmap,
O2NM_MAX_REGIONS) <= O2HB_PIN_CUT_OFF) O2NM_MAX_REGIONS) <= O2HB_PIN_CUT_OFF)
ret = o2hb_region_pin(NULL); ret = o2hb_region_pin(NULL);