ocfs2/cluster: use bitmap API instead of hand-writing it

Use bitmap_zero/bitmap_copy/bitmap_equal directly for bitmap operations.

Link: https://lkml.kernel.org/r/20221007124846.186453-1-joseph.qi@linux.alibaba.com
Signed-off-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index b13d344d40b6251c046bf42595f60cda3cbb4011..8fe6031f60e36cce4a7df3911e02c2e3cc2eb264 100644 (file)
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -335,7 +335,7 @@ static void o2hb_arm_timeout(struct o2hb_region *reg)
        /* negotiate timeout must be less than write timeout. */
        schedule_delayed_work(&reg->hr_nego_timeout_work,
                              msecs_to_jiffies(O2HB_NEGO_TIMEOUT_MS));
-       memset(reg->hr_nego_node_bitmap, 0, sizeof(reg->hr_nego_node_bitmap));
+       bitmap_zero(reg->hr_nego_node_bitmap, O2NM_MAX_NODES);
 }
 
 static void o2hb_disarm_timeout(struct o2hb_region *reg)
@@ -386,8 +386,8 @@ static void o2hb_nego_timeout(struct work_struct *work)
                                config_item_name(&reg->hr_item), reg->hr_bdev);
                        set_bit(master_node, reg->hr_nego_node_bitmap);
                }
-               if (memcmp(reg->hr_nego_node_bitmap, live_node_bitmap,
-                               sizeof(reg->hr_nego_node_bitmap))) {
+               if (!bitmap_equal(reg->hr_nego_node_bitmap, live_node_bitmap,
+                                 O2NM_MAX_NODES)) {
                        /* check negotiate bitmap every second to do timeout
                         * approve decision.
                         */
@@ -856,8 +856,8 @@ static void o2hb_set_quorum_device(struct o2hb_region *reg)
         * live nodes heartbeat on it. In other words, the region has been
         * added to all nodes.
         */
-       if (memcmp(reg->hr_live_node_bitmap, o2hb_live_node_bitmap,
-                  sizeof(o2hb_live_node_bitmap)))
+       if (!bitmap_equal(reg->hr_live_node_bitmap, o2hb_live_node_bitmap,
+                         O2NM_MAX_NODES))
                goto unlock;
 
        printk(KERN_NOTICE "o2hb: Region %s (%pg) is now a quorum device\n",
@@ -1437,11 +1437,11 @@ void o2hb_init(void)
        for (i = 0; i < ARRAY_SIZE(o2hb_live_slots); i++)
                INIT_LIST_HEAD(&o2hb_live_slots[i]);
 
-       memset(o2hb_live_node_bitmap, 0, sizeof(o2hb_live_node_bitmap));
-       memset(o2hb_region_bitmap, 0, sizeof(o2hb_region_bitmap));
-       memset(o2hb_live_region_bitmap, 0, sizeof(o2hb_live_region_bitmap));
-       memset(o2hb_quorum_region_bitmap, 0, sizeof(o2hb_quorum_region_bitmap));
-       memset(o2hb_failed_region_bitmap, 0, sizeof(o2hb_failed_region_bitmap));
+       bitmap_zero(o2hb_live_node_bitmap, O2NM_MAX_NODES);
+       bitmap_zero(o2hb_region_bitmap, O2NM_MAX_REGIONS);
+       bitmap_zero(o2hb_live_region_bitmap, O2NM_MAX_REGIONS);
+       bitmap_zero(o2hb_quorum_region_bitmap, O2NM_MAX_REGIONS);
+       bitmap_zero(o2hb_failed_region_bitmap, O2NM_MAX_REGIONS);
 
        o2hb_dependent_users = 0;
 

diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c
index 27fee68f860a682f66d080635025dfb259d985e9..2f61d39e4e509b569998e11def15e2c1e4e41802 100644 (file)
--- a/fs/ocfs2/cluster/nodemanager.c
+++ b/fs/ocfs2/cluster/nodemanager.c
@@ -54,7 +54,7 @@ int o2nm_configured_node_map(unsigned long *map, unsigned bytes)
                return -EINVAL;
 
        read_lock(&cluster->cl_nodes_lock);
-       memcpy(map, cluster->cl_nodes_bitmap, sizeof(cluster->cl_nodes_bitmap));
+       bitmap_copy(map, cluster->cl_nodes_bitmap, O2NM_MAX_NODES);
        read_unlock(&cluster->cl_nodes_lock);
 
        return 0;