diff options
Diffstat (limited to 'fs/dlm/lowcomms.c')
-rw-r--r-- | fs/dlm/lowcomms.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 24f5e55313d8..96f84541867c 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -790,6 +790,7 @@ static int accept_from_sock(struct connection *con) int nodeid; struct connection *newcon; struct connection *addcon; + unsigned int mark; if (!dlm_allow_conn) { return -1; @@ -826,6 +827,9 @@ static int accept_from_sock(struct connection *con) return -1; } + dlm_comm_mark(nodeid, &mark); + sock_set_mark(newsock->sk, mark); + log_print("got connection from %d", nodeid); /* Check to see if we already have a connection to this node. This @@ -971,9 +975,7 @@ static void sctp_connect_to_sock(struct connection *con) return; } - result = dlm_comm_mark(con->nodeid, &mark); - if (result < 0) - return; + dlm_comm_mark(con->nodeid, &mark); mutex_lock(&con->sock_mutex); @@ -1071,9 +1073,7 @@ static void tcp_connect_to_sock(struct connection *con) return; } - result = dlm_comm_mark(con->nodeid, &mark); - if (result < 0) - return; + dlm_comm_mark(con->nodeid, &mark); mutex_lock(&con->sock_mutex); if (con->retries++ > MAX_CONNECT_RETRIES) |