From f339e7a25da39135b18586af1266deb452e72d19 Mon Sep 17 00:00:00 2001
From: Michal Feix <michal@feix.cz>
Date: Sun, 30 Jul 2006 03:03:31 -0700
Subject: [PATCH] --- yaml --- r: 32933 b: refs/heads/master c:
 e4b57e0842621f597d744b193ea325d62724596b h: refs/heads/master i:   32931:
 3392abc2b7e377ac976d6797bf199ff00b3fbd30 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/block/nbd.c | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 230caa18422c..04f5e7714aa8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e185d83398b2708f50207bc12d0e0a70bd70767
+refs/heads/master: e4b57e0842621f597d744b193ea325d62724596b
diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c
index 0a1b1ea36ddc..31a0b605f261 100644
--- a/trunk/drivers/block/nbd.c
+++ b/trunk/drivers/block/nbd.c
@@ -300,6 +300,15 @@ static struct request *nbd_read_stat(struct nbd_device *lo)
 				lo->disk->disk_name, result);
 		goto harderror;
 	}
+
+	if (ntohl(reply.magic) != NBD_REPLY_MAGIC) {
+		printk(KERN_ERR "%s: Wrong magic (0x%lx)\n",
+				lo->disk->disk_name,
+				(unsigned long)ntohl(reply.magic));
+		result = -EPROTO;
+		goto harderror;
+	}
+
 	req = nbd_find_request(lo, reply.handle);
 	if (unlikely(IS_ERR(req))) {
 		result = PTR_ERR(req);
@@ -312,13 +321,6 @@ static struct request *nbd_read_stat(struct nbd_device *lo)
 		goto harderror;
 	}
 
-	if (ntohl(reply.magic) != NBD_REPLY_MAGIC) {
-		printk(KERN_ERR "%s: Wrong magic (0x%lx)\n",
-				lo->disk->disk_name,
-				(unsigned long)ntohl(reply.magic));
-		result = -EPROTO;
-		goto harderror;
-	}
 	if (ntohl(reply.error)) {
 		printk(KERN_ERR "%s: Other side returned error (%d)\n",
 				lo->disk->disk_name, ntohl(reply.error));