Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346196
b: refs/heads/master
c: 2820fd3
h: refs/heads/master
v: v3
  • Loading branch information
Philipp Reisner committed Nov 8, 2012
1 parent 84d768c commit 3dc32a4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c5b005ab7091c9ef4ca9b47569a8e27e54588933
refs/heads/master: 2820fd396940756904bd7e4136115f493c63d369
10 changes: 5 additions & 5 deletions trunk/drivers/block/drbd/drbd_receiver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 3dc32a4

Please sign in to comment.