diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2012-07-12 10:25:35 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:58:30 +0100 |
| commit | 7e0f096b8d3ffcf04955c239e80993ec451c9a1a (patch) | |
| tree | dd80f52ca201f19d7f0a684a87e11d6cb2a48426 /drivers/block/drbd/drbd_receiver.c | |
| parent | 2820fd396940756904bd7e4136115f493c63d369 (diff) | |
drbd: Remove drbd_accept() and use kernel_accept() instead
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 8f25095f390c..96ab2ffc2a41 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/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) |