diff options
| author |   Jens Axboe <jens.axboe@oracle.com> | 2006-12-19 08:33:11 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2006-12-19 08:33:11 +0100 |
| commit | 1aa4f24fe96938cabe7a1e9da8bc3bfbd1dfe3fa (patch) | |
| tree | 922149707b2741abc8dca53a3ae56e681ef0fbf6 /drivers/scsi | |
| parent | [PATCH] ->nr_sectors and ->hard_nr_sectors are not used for BLOCK_PC requests (diff) | |
| download | linux-dev-1aa4f24fe96938cabe7a1e9da8bc3bfbd1dfe3fa.tar.xz linux-dev-1aa4f24fe96938cabe7a1e9da8bc3bfbd1dfe3fa.zip | |
[PATCH] Remove queue merging hooks
We have full flexibility of merging parameters now, so we can remove the
hooks that define back/front/request merge strategies. Nobody is using
them anymore.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 41a2ea32a300..f02f48a882a9 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -265,7 +265,7 @@ static int scsi_merge_bio(struct request *rq, struct bio *bio) if (!rq->bio) blk_rq_bio_prep(q, rq, bio); - else if (!q->back_merge_fn(q, rq, bio)) + else if (!ll_back_merge_fn(q, rq, bio)) return -EINVAL; else { rq->biotail->bi_next = bio; |