The patch titled
Subject: block: remove unused blk_abort_queue()
has been removed from the -mm tree. Its filename was
block-remove-unused-blk_abort_queue.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/
------------------------------------------------------
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 *);
/*
_
Patches currently in -mm which might be from asias@xxxxxxxxxx are
linux-next.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
