The patch titled block: fix blk_register_queue() return value has been removed from the -mm tree. Its filename was block-fix-blk_register_queue-return-value.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: block: fix blk_register_queue() return value From: Akinobu Mita <akinobu.mita@xxxxxxxxx> blk_register_queue() returns -ENXIO when queue->request_fn is NULL. But there are some block drivers that call blk_register_queue() via add_disk() with queue->request_fn == NULL. (For example, brd, loop) Although no one checks return value of blk_register_queue(), this patch makes it return 0 instead of -ENXIO when queue->request_fn is NULL, Also this patch adds warning when blk_register_queue() and blk_unregister_queue() are called with queue == NULL rather than ignore invalid usage silently. Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- block/blk-sysfs.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff -puN block/blk-sysfs.c~block-fix-blk_register_queue-return-value block/blk-sysfs.c --- a/block/blk-sysfs.c~block-fix-blk_register_queue-return-value +++ a/block/blk-sysfs.c @@ -276,9 +276,12 @@ int blk_register_queue(struct gendisk *d struct request_queue *q = disk->queue; - if (!q || !q->request_fn) + if (WARN_ON(!q)) return -ENXIO; + if (!q->request_fn) + return 0; + ret = kobject_add(&q->kobj, kobject_get(&disk->dev.kobj), "%s", "queue"); if (ret < 0) @@ -300,7 +303,10 @@ void blk_unregister_queue(struct gendisk { struct request_queue *q = disk->queue; - if (q && q->request_fn) { + if (WARN_ON(!q)) + return; + + if (q->request_fn) { elv_unregister_queue(q); kobject_uevent(&q->kobj, KOBJ_REMOVE); _ Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are origin.patch ext2-improve-ext2_readdir-return-value.patch ext2-use-ext2_group_first_block_no.patch ext2-use-ext2_fsblk_t-type.patch ext3-use-ext3_group_first_block_no.patch ext3-add-missing-ext3_journal_stop.patch ext3-use-ext3_get_group_desc.patch ext3-check-ext3_journal_get_write_access-errors.patch idr-create-idr_layer_cache-at-boot-time.patch idr-create-idr_layer_cache-at-boot-time-fix.patch idr-create-idr_layer_cache-at-boot-time-fix-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html