[kernel] r22119 - dists/squeeze-security/linux-2.6/debian/patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Sun Dec  7 03:54:48 2014
New Revision: 22119

Log:
Fix use of a function we don't have in 'block: add missing blk_queue_dead() checks'

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/block-add-missing-blk_queue_dead-checks.patch

Modified: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/block-add-missing-blk_queue_dead-checks.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/block-add-missing-blk_queue_dead-checks.patch	Sun Dec  7 03:42:35 2014	(r22118)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/block-add-missing-blk_queue_dead-checks.patch	Sun Dec  7 03:54:48 2014	(r22119)
@@ -17,6 +17,7 @@
 [bwh: Backported to 2.6.32:
  - Drop inapplicable changes to queue_unplugged() and
    blk_flush_plug_list()
+ - We don't have blk_queue_dead() so open-code it
  - Adjust context]
 Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 ---
@@ -32,7 +33,7 @@
  #endif
  
  	spin_lock_irqsave(q->queue_lock, flags);
-+	if (unlikely(blk_queue_dead(q))) {
++	if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags))) {
 +		spin_unlock_irqrestore(q->queue_lock, flags);
 +		return -ENODEV;
 +	}