From 68901d2e49c39dd73b6fa40a9b11b1795ee3d835 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Thu, 12 Jul 2012 10:25:35 +0200 Subject: [PATCH] --- yaml --- r: 346197 b: refs/heads/master c: 7e0f096b8d3ffcf04955c239e80993ec451c9a1a h: refs/heads/master i: 346195: 84d768cb4ee2060c27b002155f20b66f8200a8bd v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 30 ++---------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/[refs] b/[refs] index 7e14b235433b..1b26488c954a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2820fd396940756904bd7e4136115f493c63d369 +refs/heads/master: 7e0f096b8d3ffcf04955c239e80993ec451c9a1a diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 8f25095f390c..96ab2ffc2a41 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -461,33 +461,6 @@ static void drbd_wait_ee_list_empty(struct drbd_conf *mdev, spin_unlock_irq(&mdev->tconn->req_lock); } -/* see also kernel_accept; which is only present since 2.6.18. - * also we want to log which part of it failed, exactly */ -static int drbd_accept(const char **what, struct socket *sock, struct socket **newsock) -{ - struct sock *sk = sock->sk; - int err = 0; - - *what = "sock_create_lite"; - err = sock_create_lite(sk->sk_family, sk->sk_type, sk->sk_protocol, - newsock); - if (err < 0) - goto out; - - *what = "accept"; - err = sock->ops->accept(sock, *newsock, 0); - if (err < 0) { - sock_release(*newsock); - *newsock = NULL; - goto out; - } - (*newsock)->ops = sock->ops; - __module_get((*newsock)->ops->owner); - -out: - return err; -} - static int drbd_recv_short(struct socket *sock, void *buf, size_t size, int flags) { mm_segment_t oldfs; @@ -742,7 +715,8 @@ static struct socket *drbd_wait_for_connect(struct drbd_tconn *tconn) if (err < 0) goto out; - err = drbd_accept(&what, s_listen, &s_estab); + what = "accept"; + err = kernel_accept(s_listen, &s_estab, 0); out: if (s_listen)