Skip to content

Commit fc4ea42

Browse files
Alexander Aringteigland
authored andcommitted
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 07ee386 ("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. Fixes: 07ee386 ("fs: dlm: filter ourself midcomms calls") Cc: [email protected] Signed-off-by: Alexander Aring <[email protected]> Signed-off-by: David Teigland <[email protected]>
1 parent 1696c75 commit fc4ea42

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

fs/dlm/config.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,7 @@ static void drop_comm(struct config_group *g, struct config_item *i)
532532
struct dlm_comm *cm = config_item_to_comm(i);
533533
if (local_comm == cm)
534534
local_comm = NULL;
535-
if (!cm->local)
536-
dlm_midcomms_close(cm->nodeid);
535+
dlm_midcomms_close(cm->nodeid);
537536
while (cm->addr_count--)
538537
kfree(cm->addr[cm->addr_count]);
539538
config_item_put(i);

0 commit comments

Comments
 (0)