---

yaml --- r: 253018 b: refs/heads/master c: 35fbf5b h: refs/heads/master v: v3
git-mirror · May 28, 2011 · d592e31 · d592e31
1 parent e9cd99e
commit d592e31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;