From 73007fc593e8e4e3072982294ad1e9d2df12e7a1 Mon Sep 17 00:00:00 2001
From: Paul Clements <paul.clements@steeleye.com>
Date: Wed, 11 Feb 2009 13:04:45 -0800
Subject: [PATCH] --- yaml --- r: 131297 b: refs/heads/master c:
 4d48a542b42747c36a5937447d9c3de7c897ea50 h: refs/heads/master i:   131295:
 63e556fe0722b38eebdd6dfe15612417593d728c v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/block/nbd.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ed595ec49026..37a7e94e6240 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9480c53e9b2aa13a06283ffb96bb8f1873ac4e9a
+refs/heads/master: 4d48a542b42747c36a5937447d9c3de7c897ea50
diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c
index 34f80fa6fed1..8299e2d3b611 100644
--- a/trunk/drivers/block/nbd.c
+++ b/trunk/drivers/block/nbd.c
@@ -549,6 +549,15 @@ static void do_nbd_request(struct request_queue * q)
 
 		BUG_ON(lo->magic != LO_MAGIC);
 
+		if (unlikely(!lo->sock)) {
+			printk(KERN_ERR "%s: Attempted send on closed socket\n",
+				lo->disk->disk_name);
+			req->errors++;
+			nbd_end_request(req);
+			spin_lock_irq(q->queue_lock);
+			continue;
+		}
+
 		spin_lock_irq(&lo->queue_lock);
 		list_add_tail(&req->queuelist, &lo->waiting_queue);
 		spin_unlock_irq(&lo->queue_lock);