From: Philipp Reisner Date: Thu, 12 Jul 2012 08:22:48 +0000 (+0200) Subject: drbd: Move the call to listen() out of drbd_accept() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2820fd396940756904bd7e4136115f493c63d369;p=deliverable%2Flinux.git drbd: Move the call to listen() out of drbd_accept() Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg --- diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 1e9e5145e3c3..8f25095f390c 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -468,11 +468,6 @@ static int drbd_accept(const char **what, struct socket *sock, struct socket **n struct sock *sk = sock->sk; int err = 0; - *what = "listen"; - err = sock->ops->listen(sock, 5); - if (err < 0) - goto out; - *what = "sock_create_lite"; err = sock_create_lite(sk->sk_family, sk->sk_type, sk->sk_protocol, newsock); @@ -742,6 +737,11 @@ static struct socket *drbd_wait_for_connect(struct drbd_tconn *tconn) if (err < 0) goto out; + what = "listen"; + err = s_listen->ops->listen(s_listen, 5); + if (err < 0) + goto out; + err = drbd_accept(&what, s_listen, &s_estab); out: