diff options
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/socket.c b/net/socket.c index f92145554f34..f6c519d7b3ba 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -633,8 +633,7 @@ static int do_sock_sendmsg(struct socket *sock, struct msghdr *msg, | |||
633 | init_sync_kiocb(&iocb, NULL); | 633 | init_sync_kiocb(&iocb, NULL); |
634 | ret = nosec ? __sock_sendmsg_nosec(&iocb, sock, msg, size) : | 634 | ret = nosec ? __sock_sendmsg_nosec(&iocb, sock, msg, size) : |
635 | __sock_sendmsg(&iocb, sock, msg, size); | 635 | __sock_sendmsg(&iocb, sock, msg, size); |
636 | if (-EIOCBQUEUED == ret) | 636 | BUG_ON(ret == -EIOCBQUEUED); |
637 | ret = wait_on_sync_kiocb(&iocb); | ||
638 | return ret; | 637 | return ret; |
639 | } | 638 | } |
640 | 639 | ||
@@ -766,8 +765,7 @@ int sock_recvmsg(struct socket *sock, struct msghdr *msg, | |||
766 | 765 | ||
767 | init_sync_kiocb(&iocb, NULL); | 766 | init_sync_kiocb(&iocb, NULL); |
768 | ret = __sock_recvmsg(&iocb, sock, msg, size, flags); | 767 | ret = __sock_recvmsg(&iocb, sock, msg, size, flags); |
769 | if (-EIOCBQUEUED == ret) | 768 | BUG_ON(ret == -EIOCBQUEUED); |
770 | ret = wait_on_sync_kiocb(&iocb); | ||
771 | return ret; | 769 | return ret; |
772 | } | 770 | } |
773 | EXPORT_SYMBOL(sock_recvmsg); | 771 | EXPORT_SYMBOL(sock_recvmsg); |
@@ -780,8 +778,7 @@ static int sock_recvmsg_nosec(struct socket *sock, struct msghdr *msg, | |||
780 | 778 | ||
781 | init_sync_kiocb(&iocb, NULL); | 779 | init_sync_kiocb(&iocb, NULL); |
782 | ret = __sock_recvmsg_nosec(&iocb, sock, msg, size, flags); | 780 | ret = __sock_recvmsg_nosec(&iocb, sock, msg, size, flags); |
783 | if (-EIOCBQUEUED == ret) | 781 | BUG_ON(ret == -EIOCBQUEUED); |
784 | ret = wait_on_sync_kiocb(&iocb); | ||
785 | return ret; | 782 | return ret; |
786 | } | 783 | } |
787 | 784 | ||