From 616aa8a781e8e7cfd1f02c29ae40e91918662161 Mon Sep 17 00:00:00 2001
From: Li Dongyang <lidongyang@novell.com>
Date: Wed, 14 Sep 2011 14:02:40 +0800
Subject: [PATCH] --- yaml --- r: 273835 b: refs/heads/master c:
 69ef68cef961a934c35308843a04b26d91cad4a8 h: refs/heads/master i:   273833:
 5a54e56f6fa6b1c0354837f669dd1b1c7686cf23   273831:
 63b960bdb5dbe3d323b8e8141d36c4189e551436 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/block/xen-blkfront.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e91af1fbd358..5800d15cc67a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed30bf317c5ceb25166cdbce3e0b35e33c82b509
+refs/heads/master: 69ef68cef961a934c35308843a04b26d91cad4a8
diff --git a/trunk/drivers/block/xen-blkfront.c b/trunk/drivers/block/xen-blkfront.c
index 52076b0d0326..7d1487760283 100644
--- a/trunk/drivers/block/xen-blkfront.c
+++ b/trunk/drivers/block/xen-blkfront.c
@@ -747,9 +747,7 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
 					   info->gd->disk_name);
 				error = -EOPNOTSUPP;
 				info->feature_discard = 0;
-				spin_lock(rq->queue_lock);
 				queue_flag_clear(QUEUE_FLAG_DISCARD, rq);
-				spin_unlock(rq->queue_lock);
 			}
 			__blk_end_request_all(req, error);
 			break;