diff options
| author | Alexander Viro <viro@math.psu.edu> | 2002-10-28 02:50:17 -0800 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2002-10-28 02:50:17 -0800 |
| commit | d5f24b98451a31d4de768437450962e6f963d8ee (patch) | |
| tree | 8360c1bafd591ef4da4c88f1e2246d4fdd54aceb /include | |
| parent | 996395f2018e707823b25ec48862e6003b1e5dae (diff) | |
[PATCH] blk_dev[] is gone
* remove blk_dev[]
* removed BLK_DEFAULT_QUEUE
* moved definition of CURRENT into drivers that used it
* removed definition of QUEUE from headers
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blk.h | 15 | ||||
| -rw-r--r-- | include/linux/blkdev.h | 25 |
2 files changed, 5 insertions, 35 deletions
diff --git a/include/linux/blk.h b/include/linux/blk.h index 6f47ea7c853c..03f75158a2a5 100644 --- a/include/linux/blk.h +++ b/include/linux/blk.h @@ -53,19 +53,6 @@ static inline void blkdev_dequeue_request(struct request *req) elv_remove_request(req->q, req); } -#if defined(MAJOR_NR) || defined(IDE_DRIVER) -#if (MAJOR_NR != SCSI_TAPE_MAJOR) && (MAJOR_NR != OSST_MAJOR) -#if !defined(IDE_DRIVER) - -#ifndef QUEUE -# define QUEUE (&blk_dev[MAJOR_NR].request_queue) -#endif -#ifndef CURRENT -# define CURRENT elv_next_request(QUEUE) -#endif - -#endif /* !defined(IDE_DRIVER) */ - /* * If we have our own end_request, we do not want to include this mess */ @@ -80,7 +67,5 @@ static inline void end_request(struct request *req, int uptodate) end_that_request_last(req); } #endif /* !LOCAL_END_REQUEST */ -#endif /* (MAJOR_NR != SCSI_TAPE_MAJOR) */ -#endif /* defined(MAJOR_NR) || defined(IDE_DRIVER) */ #endif /* _BLK_H */ diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 722ebb04e25c..5aa09c66484f 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -287,33 +287,13 @@ inline void blk_queue_bounce(request_queue_t *q, struct bio **bio); if ((rq->bio)) \ for (bio = (rq)->bio; bio; bio = bio->bi_next) -struct blk_dev_struct { - /* - * queue_proc has to be atomic - */ - request_queue_t request_queue; - queue_proc *queue; - void *data; -}; - struct sec_size { unsigned block_size; unsigned block_size_bits; }; -/* - * Used to indicate the default queue for drivers that don't bother - * to implement multiple queues. We have this access macro here - * so as to eliminate the need for each and every block device - * driver to know about the internal structure of blk_dev[]. - */ -#define BLK_DEFAULT_QUEUE(_MAJOR) &blk_dev[_MAJOR].request_queue - -extern struct sec_size * blk_sec[MAX_BLKDEV]; -extern struct blk_dev_struct blk_dev[MAX_BLKDEV]; extern void register_disk(struct gendisk *dev); extern void generic_make_request(struct bio *bio); -extern inline request_queue_t *bdev_get_queue(struct block_device *bdev); extern void blk_put_request(struct request *); extern void blk_attempt_remerge(request_queue_t *, struct request *); extern void __blk_attempt_remerge(request_queue_t *, struct request *); @@ -331,6 +311,11 @@ extern void blk_start_queue(request_queue_t *q); extern void blk_stop_queue(request_queue_t *q); extern void __blk_stop_queue(request_queue_t *q); +static inline request_queue_t *bdev_get_queue(struct block_device *bdev) +{ + return bdev->bd_queue; +} + /* * get ready for proper ref counting */ |