Skip to content

Commit

Permalink
drbd: Remove drbd_accept() and use kernel_accept() instead
Browse files Browse the repository at this point in the history
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
  • Loading branch information
Philipp Reisner committed Nov 8, 2012
1 parent 2820fd3 commit 7e0f096
Showing 1 changed file with 2 additions and 28 deletions.
30 changes: 2 additions & 28 deletions drivers/block/drbd/drbd_receiver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 7e0f096

Please sign in to comment.