---

yaml --- r: 273835 b: refs/heads/master c: 69ef68c h: refs/heads/master i: 273833: 5a54e56 273831: 63b960b v: v3
git-mirror · Oct 13, 2011 · 616aa8a · 616aa8a
1 parent ac8aa9d
commit 616aa8a
Show file tree

Hide file tree

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