fs: dlm: remove filter local comms on close
Alexander Aring
maintainerPATCH 1/2 fs: dlm: remove filter local comms on close
The current way how lowcomms is configured is due configfs entries. Each comms configfs entry will create a lowcomms connection. Even the local connection itself will be stored as a lowcomms connection, although most functionality for a local lowcomms connection struct is not necessary.
Now in some scenarios we will see that dlm_controld reports a -EEXIST when configure a node via configfs:
... /sys/kernel/config/dlm/cluster/comms/1/addr: write failed: 17 -1
Doing a:
cat /sys/kernel/config/dlm/cluster/comms/1/addr_list
reported nothing. This was being seen on cluster with nodeid 1 and it's local configuration. To be sure the configfs entries are in sync with lowcomms connection structures we always call dlm_midcomms_close() to be sure the lowcomms connection gets removed when the configfs entry gets dropped.
Before commit 07ee38674a0b ("fs: dlm: filter ourself midcomms calls") it was just doing this by accident and the filter by doing:
if (nodeid == dlm_our_nodeid())
return 0;
inside dlm_midcomms_close() was never been hit because drop_comm() sets local_comm to NULL and cause that dlm_our_nodeid() returns always the invalid nodeid 0.
--- fs/dlm/config.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/dlm/config.c +1 -2
@@ -532,8 +532,7 @@ static void drop_comm(struct config_group *g, struct config_item *i)struct dlm_comm *cm =config_item_to_comm (i);if (local_comm == cm) local_comm =NULL ; -if (!cm->local) -dlm_midcomms_close (cm->nodeid); +dlm_midcomms_close (cm->nodeid);while (cm->addr_count--)kfree (cm->addr[cm->addr_count]);config_item_put (i);
Signature · 1 line
2.31.1
Alexander Aring
maintainerPATCH 2/2 fs: dlm: remove clear_members_cb
This patch is just a small cleanup to directly call remove_remote_member() instead of going over clear_members_cb() which just calls remove_remote_member().
--- fs/dlm/member.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
fs/dlm/member.c +1 -6
@@ -393,14 +393,9 @@ static void remove_remote_member(int nodeid)dlm_midcomms_remove_member (nodeid); } -static void clear_members_cb (int nodeid) -{ -remove_remote_member (nodeid); -} -void dlm_clear_members (struct dlm_ls *ls) { -clear_memb_list (&ls->ls_nodes, clear_members_cb); +clear_memb_list (&ls->ls_nodes, remove_remote_member); ls->ls_num_nodes =0 ; }
Signature · 1 line
2.31.1