ocfs2-dlm-use-bitmap-api-instead-of-hand-writing-it.patch removed from -mm tree
The quilt patch titled
Subject: ocfs2/dlm: use bitmap API instead of hand-writing it
has been removed from the -mm tree. Its filename was
ocfs2-dlm-use-bitmap-api-instead-of-hand-writing-it.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Joseph Qi <[email protected]>
Subject: ocfs2/dlm: use bitmap API instead of hand-writing it
Date: Fri, 7 Oct 2022 20:48:46 +0800
Use bitmap_zero/bitmap_copy/bitmap_qeual directly for bitmap operations.
Signed-off-by Joseph Qi <[email protected]>
Cc Changwei Ge <[email protected]>
Cc Gang He <[email protected]>
Cc Joel Becker <[email protected]>
Cc Jun Piao <[email protected]>
Cc Junxiao Bi <[email protected]>
Cc Mark Fasheh <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/ocfs2/dlm/dlmcommon.h | 2 +- fs/ocfs2/dlm/dlmdomain.c | 17 +++++++---------- fs/ocfs2/dlm/dlmmaster.c | 30 +++++++++++++++--------------- fs/ocfs2/dlm/dlmrecovery.c | 2 +- 4 files changed, 24 insertions(+), 27 deletions(-)
fs/ocfs2/dlm/dlmcommon.h renamed from fs/ocfs2/dlm/dlmcommon.h~ocfs2-dlm-use-bitmap-api-instead-of-hand-writing-it +1 -1
@@ -1094,7 +1094,7 @@ static inline enum dlm_status dlm_err_tostatic inline void dlm_node_iter_init (unsigned long *map,struct dlm_node_iter *iter) { -memcpy (iter->node_map, map,sizeof (iter->node_map)); +bitmap_copy (iter->node_map, map,O2NM_MAX_NODES ); iter->curnode =-1 ; }
fs/ocfs2/dlm/dlmdomain.c renamed from fs/ocfs2/dlm/dlmdomain.c~ocfs2-dlm-use-bitmap-api-instead-of-hand-writing-it +7 -10
@@ -1576,8 +1576,8 @@ static int dlm_should_restart_join(strucspin_lock (&dlm->spinlock);/* For now, we restart the process if the node maps have * changed at all */ - ret =memcmp (ctxt->live_map, dlm->live_nodes_map, -sizeof (dlm->live_nodes_map)); + ret = !bitmap_equal (ctxt->live_map, dlm->live_nodes_map, +O2NM_MAX_NODES );spin_unlock (&dlm->spinlock);if (ret)
@@ -1607,10 +1607,8 @@ static int dlm_try_to_join_domain(structo2hb_fill_node_map (dlm->live_nodes_map,O2NM_MAX_NODES );spin_lock (&dlm->spinlock); -memcpy (ctxt->live_map, dlm->live_nodes_map,sizeof (ctxt->live_map)); - +bitmap_copy (ctxt->live_map, dlm->live_nodes_map,O2NM_MAX_NODES );__dlm_set_joining_node (dlm, dlm->node_num); -spin_unlock (&dlm->spinlock); node =-1 ;
@@ -1643,8 +1641,7 @@ static int dlm_try_to_join_domain(struct* yes_resp_map. Copy that into our domain map and send a join * assert message to clean up everyone elses state. */ spin_lock (&dlm->spinlock); -memcpy (dlm->domain_map, ctxt->yes_resp_map, -sizeof (ctxt->yes_resp_map)); +bitmap_copy (dlm->domain_map, ctxt->yes_resp_map,O2NM_MAX_NODES );set_bit (dlm->node_num, dlm->domain_map);spin_unlock (&dlm->spinlock);
@@ -2009,9 +2006,9 @@ static struct dlm_ctxt *dlm_alloc_ctxt(cmlog (0 ,"dlm->recovery_map=%p, &(dlm->recovery_map[0])=%p\n" , dlm->recovery_map, &(dlm->recovery_map[0 ])); -memset (dlm->recovery_map,0 ,sizeof (dlm->recovery_map)); -memset (dlm->live_nodes_map,0 ,sizeof (dlm->live_nodes_map)); -memset (dlm->domain_map,0 ,sizeof (dlm->domain_map)); +bitmap_zero (dlm->recovery_map,O2NM_MAX_NODES ); +bitmap_zero (dlm->live_nodes_map,O2NM_MAX_NODES ); +bitmap_zero (dlm->domain_map,O2NM_MAX_NODES ); dlm->dlm_thread_task =NULL ; dlm->dlm_reco_thread_task =NULL ;
fs/ocfs2/dlm/dlmmaster.c renamed from fs/ocfs2/dlm/dlmmaster.c~ocfs2-dlm-use-bitmap-api-instead-of-hand-writing-it +15 -15
@@ -258,12 +258,12 @@ static void dlm_init_mle(struct dlm_mast mle->type = type;INIT_HLIST_NODE (&mle->master_hash_node);INIT_LIST_HEAD (&mle->hb_events); -memset (mle->maybe_map,0 ,sizeof (mle->maybe_map)); +bitmap_zero (mle->maybe_map,O2NM_MAX_NODES );spin_lock_init (&mle->spinlock);init_waitqueue_head (&mle->wq);atomic_set (&mle->woken,0 );kref_init (&mle->mle_refs); -memset (mle->response_map,0 ,sizeof (mle->response_map)); +bitmap_zero (mle->response_map,O2NM_MAX_NODES ); mle->master =O2NM_MAX_NODES ; mle->new_master =O2NM_MAX_NODES ; mle->inuse =0 ;
@@ -290,8 +290,8 @@ static void dlm_init_mle(struct dlm_mastatomic_inc (&dlm->mle_cur_count[mle->type]);/* copy off the node_map and register hb callbacks on our copy */ -memcpy (mle->node_map, dlm->domain_map,sizeof (mle->node_map)); -memcpy (mle->vote_map, dlm->domain_map,sizeof (mle->vote_map)); +bitmap_copy (mle->node_map, dlm->domain_map,O2NM_MAX_NODES ); +bitmap_copy (mle->vote_map, dlm->domain_map,O2NM_MAX_NODES );clear_bit (dlm->node_num, mle->vote_map);clear_bit (dlm->node_num, mle->node_map);
@@ -572,7 +572,7 @@ static void dlm_init_lockres(struct dlm_spin_unlock (&dlm->track_lock);memset (res->lvb,0 ,DLM_LVB_LEN ); -memset (res->refmap,0 ,sizeof (res->refmap)); +bitmap_zero (res->refmap,O2NM_MAX_NODES ); } struct dlm_lock_resource *dlm_new_lockres(struct dlm_ctxt *dlm,
@@ -1036,10 +1036,10 @@ recheck:spin_lock (&mle->spinlock); m = mle->master; - map_changed = (memcmp (mle->vote_map, mle->node_map, -sizeof (mle->vote_map)) !=0 ); - voting_done = (memcmp (mle->vote_map, mle->response_map, -sizeof (mle->vote_map)) ==0 ); + map_changed = !bitmap_equal (mle->vote_map, mle->node_map, +O2NM_MAX_NODES ); + voting_done =bitmap_equal (mle->vote_map, mle->response_map, +O2NM_MAX_NODES );/* restart if we hit any errors */ if (map_changed) {
@@ -1277,11 +1277,11 @@ static int dlm_restart_lock_mastery(stru/* now blank out everything, as if we had never * contacted anyone */ -memset (mle->maybe_map,0 ,sizeof (mle->maybe_map)); -memset (mle->response_map,0 ,sizeof (mle->response_map)); +bitmap_zero (mle->maybe_map,O2NM_MAX_NODES ); +bitmap_zero (mle->response_map,O2NM_MAX_NODES );/* reset the vote_map to the current node_map */ -memcpy (mle->vote_map, mle->node_map, -sizeof (mle->node_map)); +bitmap_copy (mle->vote_map, mle->node_map, +O2NM_MAX_NODES );/* put myself into the maybe map */ if (mle->type !=DLM_MLE_BLOCK )set_bit (dlm->node_num, mle->maybe_map);
@@ -2094,7 +2094,7 @@ static void dlm_assert_master_worker(str flags = item->u.am.flags;spin_lock (&dlm->spinlock); -memcpy (nodemap, dlm->domain_map,sizeof (nodemap)); +bitmap_copy (nodemap, dlm->domain_map,O2NM_MAX_NODES );spin_unlock (&dlm->spinlock);clear_bit (dlm->node_num, nodemap);
@@ -3447,7 +3447,7 @@ int dlm_finish_migration(struct dlm_ctxt ret =0 ; } -memset (iter.node_map,0 ,sizeof (iter.node_map)); +bitmap_zero (iter.node_map,O2NM_MAX_NODES );set_bit (old_master, iter.node_map);mlog (0 ,"doing assert master of %.*s back to %u\n" , res->lockname.len, res->lockname.name, old_master);
fs/ocfs2/dlm/dlmrecovery.c renamed from fs/ocfs2/dlm/dlmrecovery.c~ocfs2-dlm-use-bitmap-api-instead-of-hand-writing-it +1 -1
@@ -733,7 +733,7 @@ static int dlm_init_recovery_area(structstruct dlm_reco_node_data *ndata;spin_lock (&dlm->spinlock); -memcpy (dlm->reco.node_map, dlm->domain_map,sizeof (dlm->domain_map)); +bitmap_copy (dlm->reco.node_map, dlm->domain_map,O2NM_MAX_NODES );/* nodes can only be removed (by dying) after dropping * this lock, and death will be trapped later, so this should do */ spin_unlock (&dlm->spinlock);
_
Patches currently in -mm which might be from [email protected] are