aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2012-07-12 04:22:48 -0400
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 10:58:29 -0500
commit2820fd396940756904bd7e4136115f493c63d369 (patch)
tree88eb8980212dd39620917a703126b73597567668 /drivers/block/drbd
parentc5b005ab7091c9ef4ca9b47569a8e27e54588933 (diff)
drbd: Move the call to listen() out of drbd_accept()
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd')
-rw-r--r--drivers/block/drbd/drbd_receiver.c10
1 files changed, 5 insertions, 5 deletions
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
468 struct sock *sk = sock->sk; 468 struct sock *sk = sock->sk;
469 int err = 0; 469 int err = 0;
470 470
471 *what = "listen";
472 err = sock->ops->listen(sock, 5);
473 if (err < 0)
474 goto out;
475
476 *what = "sock_create_lite"; 471 *what = "sock_create_lite";
477 err = sock_create_lite(sk->sk_family, sk->sk_type, sk->sk_protocol, 472 err = sock_create_lite(sk->sk_family, sk->sk_type, sk->sk_protocol,
478 newsock); 473 newsock);
@@ -742,6 +737,11 @@ static struct socket *drbd_wait_for_connect(struct drbd_tconn *tconn)
742 if (err < 0) 737 if (err < 0)
743 goto out; 738 goto out;
744 739
740 what = "listen";
741 err = s_listen->ops->listen(s_listen, 5);
742 if (err < 0)
743 goto out;
744
745 err = drbd_accept(&what, s_listen, &s_estab); 745 err = drbd_accept(&what, s_listen, &s_estab);
746 746
747out: 747out: