From 28773fdd58dad286a26d0d00d22a901bae179e15 Mon Sep 17 00:00:00 2001 From: Ying Xue Date: Fri, 10 Aug 2012 14:58:42 +0800 Subject: [PATCH] --- yaml --- r: 326217 b: refs/heads/master c: 4dd40f0cd99a3500c6df80eb8f537678559c761e h: refs/heads/master i: 326215: 4e8b76e41b2f8d5a499163e7f09a0f191cf3929a v: v3 --- [refs] | 2 +- trunk/fs/dlm/lowcomms.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1ad25c0010b9..30284069dec4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4c798cf695dc7cee9798a686128461ad0070115 +refs/heads/master: 4dd40f0cd99a3500c6df80eb8f537678559c761e diff --git a/trunk/fs/dlm/lowcomms.c b/trunk/fs/dlm/lowcomms.c index 3e6aaccce951..3637f3f18824 100644 --- a/trunk/fs/dlm/lowcomms.c +++ b/trunk/fs/dlm/lowcomms.c @@ -473,7 +473,7 @@ int dlm_lowcomms_connect_node(int nodeid) } /* Make a socket active */ -static int add_sock(struct socket *sock, struct connection *con) +static void add_sock(struct socket *sock, struct connection *con) { con->sock = sock; @@ -483,7 +483,6 @@ static int add_sock(struct socket *sock, struct connection *con) con->sock->sk->sk_state_change = lowcomms_state_change; con->sock->sk->sk_user_data = con; con->sock->sk->sk_allocation = GFP_NOFS; - return 0; } /* Add the port number to an IPv6 or 4 sockaddr and return the address