The patch titled Subject: block: remove unused blk_abort_queue() has been added to the -mm tree. Its filename is block-remove-unused-blk_abort_queue.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Asias He <asias@xxxxxxxxxx> Subject: block: remove unused blk_abort_queue() This function was only used by btrfs code in btrfs_abort_devices() (seems in a wrong way). That call was removed in d07eb9117050 ("btrfs: Drop unused function btrfs_abort_devices()"), so let's remove the dead code to avoid any confusion. already. Signed-off-by: Asias He <asias@xxxxxxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Cc: Chris Mason <chris.mason@xxxxxxxxxx> Cc: David Sterba <dave@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- block/blk-timeout.c | 41 --------------------------------------- include/linux/blkdev.h | 1 2 files changed, 42 deletions(-) diff -puN block/blk-timeout.c~block-remove-unused-blk_abort_queue block/blk-timeout.c --- a/block/blk-timeout.c~block-remove-unused-blk_abort_queue +++ a/block/blk-timeout.c @@ -197,44 +197,3 @@ void blk_add_timer(struct request *req) mod_timer(&q->timeout, expiry); } -/** - * blk_abort_queue -- Abort all request on given queue - * @queue: pointer to queue - * - */ -void blk_abort_queue(struct request_queue *q) -{ - unsigned long flags; - struct request *rq, *tmp; - LIST_HEAD(list); - - /* - * Not a request based block device, nothing to abort - */ - if (!q->request_fn) - return; - - spin_lock_irqsave(q->queue_lock, flags); - - elv_abort_queue(q); - - /* - * Splice entries to local list, to avoid deadlocking if entries - * get readded to the timeout list by error handling - */ - list_splice_init(&q->timeout_list, &list); - - list_for_each_entry_safe(rq, tmp, &list, timeout_list) - blk_abort_request(rq); - - /* - * Occasionally, blk_abort_request() will return without - * deleting the element from the list. Make sure we add those back - * instead of leaving them on the local stack list. - */ - list_splice(&list, &q->timeout_list); - - spin_unlock_irqrestore(q->queue_lock, flags); - -} -EXPORT_SYMBOL_GPL(blk_abort_queue); diff -puN include/linux/blkdev.h~block-remove-unused-blk_abort_queue include/linux/blkdev.h --- a/include/linux/blkdev.h~block-remove-unused-blk_abort_queue +++ a/include/linux/blkdev.h @@ -830,7 +830,6 @@ extern bool __blk_end_request_err(struct extern void blk_complete_request(struct request *); extern void __blk_complete_request(struct request *); extern void blk_abort_request(struct request *); -extern void blk_abort_queue(struct request_queue *); extern void blk_unprep_request(struct request *); /* _ Subject: Subject: block: remove unused blk_abort_queue() Patches currently in -mm which might be from asias@xxxxxxxxxx are linux-next.patch block-remove-unused-blk_abort_queue.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