diff --git a/[refs] b/[refs] index 87bd19a1a981..f439a00cd785 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6df87e65dbe4528ef07b917af89913abb8caaaba +refs/heads/master: 35fbf5bcf497d6ddbe7b6478141e7526d1474ff5 diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c index e6fc716aca45..1df3bfe5225b 100644 --- a/trunk/drivers/block/nbd.c +++ b/trunk/drivers/block/nbd.c @@ -192,7 +192,8 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size, if (lo->xmit_timeout) del_timer_sync(&ti); } else - result = kernel_recvmsg(sock, &msg, &iov, 1, size, 0); + result = kernel_recvmsg(sock, &msg, &iov, 1, size, + msg.msg_flags); if (signal_pending(current)) { siginfo_t info;