Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] Don't make debugfs depend on DEBUG_KERNEL
  [PATCH] Fix blktrace compile with sysfs not defined
  [PATCH] unused label in drivers/block/cciss.
  [BLOCK] increase size of disk stat counters
  [PATCH] blk_execute_rq_nowait-speedup
  [PATCH] ide-cd: quiet down GPCMD_READ_CDVD_CAPACITY failure
  [BLOCK] ll_rw_blk: kmalloc -> kzalloc conversion
  [PATCH] kzalloc() conversion in drivers/block
  [PATCH] update max_sectors documentation

1 files changed, 7 insertions, 7 deletions

diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index a2e333ad0b64..82469db25100 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -908,17 +908,15 @@ init_tag_map(request_queue_t *q, struct blk_queue_tag *tags, int depth)
                                 __FUNCTION__, depth);
         }
 
-        tag_index = kmalloc(depth * sizeof(struct request *), GFP_ATOMIC);
+        tag_index = kzalloc(depth * sizeof(struct request *), GFP_ATOMIC);
         if (!tag_index)
                 goto fail;
 
         nr_ulongs = ALIGN(depth, BITS_PER_LONG) / BITS_PER_LONG;
-        tag_map = kmalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC);
+        tag_map = kzalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC);
         if (!tag_map)
                 goto fail;
 
-        memset(tag_index, 0, depth * sizeof(struct request *));
-        memset(tag_map, 0, nr_ulongs * sizeof(unsigned long));
         tags->real_max_depth = depth;
         tags->max_depth = depth;
         tags->tag_index = tag_index;
@@ -2481,10 +2479,12 @@ void blk_execute_rq_nowait(request_queue_t *q, struct gendisk *bd_disk,
         rq->rq_disk = bd_disk;
         rq->flags |= REQ_NOMERGE;
         rq->end_io = done;
-        elv_add_request(q, rq, where, 1);
-        generic_unplug_device(q);
+        WARN_ON(irqs_disabled());
+        spin_lock_irq(q->queue_lock);
+        __elv_add_request(q, rq, where, 1);
+        __generic_unplug_device(q);
+        spin_unlock_irq(q->queue_lock);
 }
-
 EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);
 
 /**