diff options
Diffstat (limited to 'fs/dlm/member.c')
-rw-r--r-- | fs/dlm/member.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/dlm/member.c b/fs/dlm/member.c index 26133f05ae3a..2afb77051cce 100644 --- a/fs/dlm/member.c +++ b/fs/dlm/member.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /****************************************************************************** | 1 | /****************************************************************************** |
2 | ******************************************************************************* | 2 | ******************************************************************************* |
3 | ** | 3 | ** |
4 | ** Copyright (C) 2005-2008 Red Hat, Inc. All rights reserved. | 4 | ** Copyright (C) 2005-2009 Red Hat, Inc. All rights reserved. |
5 | ** | 5 | ** |
6 | ** This copyrighted material is made available to anyone wishing to use, | 6 | ** This copyrighted material is made available to anyone wishing to use, |
7 | ** modify, copy, or redistribute it subject to the terms and conditions | 7 | ** modify, copy, or redistribute it subject to the terms and conditions |
@@ -17,6 +17,7 @@ | |||
17 | #include "recover.h" | 17 | #include "recover.h" |
18 | #include "rcom.h" | 18 | #include "rcom.h" |
19 | #include "config.h" | 19 | #include "config.h" |
20 | #include "lowcomms.h" | ||
20 | 21 | ||
21 | static void add_ordered_member(struct dlm_ls *ls, struct dlm_member *new) | 22 | static void add_ordered_member(struct dlm_ls *ls, struct dlm_member *new) |
22 | { | 23 | { |
@@ -45,7 +46,7 @@ static void add_ordered_member(struct dlm_ls *ls, struct dlm_member *new) | |||
45 | static int dlm_add_member(struct dlm_ls *ls, int nodeid) | 46 | static int dlm_add_member(struct dlm_ls *ls, int nodeid) |
46 | { | 47 | { |
47 | struct dlm_member *memb; | 48 | struct dlm_member *memb; |
48 | int w; | 49 | int w, error; |
49 | 50 | ||
50 | memb = kzalloc(sizeof(struct dlm_member), GFP_KERNEL); | 51 | memb = kzalloc(sizeof(struct dlm_member), GFP_KERNEL); |
51 | if (!memb) | 52 | if (!memb) |
@@ -57,6 +58,12 @@ static int dlm_add_member(struct dlm_ls *ls, int nodeid) | |||
57 | return w; | 58 | return w; |
58 | } | 59 | } |
59 | 60 | ||
61 | error = dlm_lowcomms_connect_node(nodeid); | ||
62 | if (error < 0) { | ||
63 | kfree(memb); | ||
64 | return error; | ||
65 | } | ||
66 | |||
60 | memb->nodeid = nodeid; | 67 | memb->nodeid = nodeid; |
61 | memb->weight = w; | 68 | memb->weight = w; |
62 | add_ordered_member(ls, memb); | 69 | add_ordered_member(ls, memb); |