Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+2 -28
+2 -28
drivers/block/drbd/drbd_receiver.c
··· 461 461 spin_unlock_irq(&mdev->tconn->req_lock); 462 462 } 463 463 464 - /* see also kernel_accept; which is only present since 2.6.18. 465 - * also we want to log which part of it failed, exactly */ 466 - static int drbd_accept(const char **what, struct socket *sock, struct socket **newsock) 467 - { 468 - struct sock *sk = sock->sk; 469 - int err = 0; 470 - 471 - *what = "sock_create_lite"; 472 - err = sock_create_lite(sk->sk_family, sk->sk_type, sk->sk_protocol, 473 - newsock); 474 - if (err < 0) 475 - goto out; 476 - 477 - *what = "accept"; 478 - err = sock->ops->accept(sock, *newsock, 0); 479 - if (err < 0) { 480 - sock_release(*newsock); 481 - *newsock = NULL; 482 - goto out; 483 - } 484 - (*newsock)->ops = sock->ops; 485 - __module_get((*newsock)->ops->owner); 486 - 487 - out: 488 - return err; 489 - } 490 - 491 464 static int drbd_recv_short(struct socket *sock, void *buf, size_t size, int flags) 492 465 { 493 466 mm_segment_t oldfs; ··· 715 742 if (err < 0) 716 743 goto out; 717 744 718 - err = drbd_accept(&what, s_listen, &s_estab); 745 + what = "accept"; 746 + err = kernel_accept(s_listen, &s_estab, 0); 719 747 720 748 out: 721 749 if (s_listen)