From 320e49589fbfd23cf166e41ab85f8396effb4489 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 29 Jan 2008 13:55:40 +0100 Subject: [PATCH] --- yaml --- r: 79555 b: refs/heads/master c: db1d08c646e47f3c7835ecdabb51a906ec311f69 h: refs/heads/master i: 79553: 89a549d3edcaa0b8b066f4fb01279f857be2795c 79551: b62157ceed7a13ba2f3a6794779497e99805ce6c v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5d88472bb644..50c1bc7a521c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26b8256e2bb930a8e4d4d10aa74950d8921376b8 +refs/heads/master: db1d08c646e47f3c7835ecdabb51a906ec311f69 diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index 3d415ec10fb8..99f4d641edf5 100644 --- a/trunk/block/blk-core.c +++ b/trunk/block/blk-core.c @@ -381,11 +381,6 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq, EXPORT_SYMBOL(blk_rq_map_sg); -/* - * the standard queue merge functions, can be overridden with device - * specific ones if so desired - */ - static inline int ll_new_mergeable(struct request_queue *q, struct request *req, struct bio *bio)