aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe2006-07-28 02:36:46 -0500
committerJens Axboe2006-09-30 13:29:38 -0500
commita3b05e8f58c95dfccbf2c824d0c68e5990571f24 (patch)
tree768aad0f032790df38b277eff062c47b6ecff533
parent1ea25ecb7256978947c258f08a30c878eebe9edb (diff)
downloadkernel-common-a3b05e8f58c95dfccbf2c824d0c68e5990571f24.tar.gz
kernel-common-a3b05e8f58c95dfccbf2c824d0c68e5990571f24.tar.xz
kernel-common-a3b05e8f58c95dfccbf2c824d0c68e5990571f24.zip
[PATCH] Kill various deprecated/unused block layer defines/functions
Signed-off-by: Jens Axboe <axboe@suse.de>
-rw-r--r--drivers/block/cciss.c1
-rw-r--r--drivers/block/cpqarray.c1
-rw-r--r--include/linux/blkdev.h29
-rw-r--r--include/linux/fs.h1
4 files changed, 0 insertions, 32 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 2cd3391ff87..c211065ad82 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1229,7 +1229,6 @@ static inline void complete_buffers(struct bio *bio, int status)
1229 int nr_sectors = bio_sectors(bio); 1229 int nr_sectors = bio_sectors(bio);
1230 1230
1231 bio->bi_next = NULL; 1231 bio->bi_next = NULL;
1232 blk_finished_io(len);
1233 bio_endio(bio, nr_sectors << 9, status ? 0 : -EIO); 1232 bio_endio(bio, nr_sectors << 9, status ? 0 : -EIO);
1234 bio = xbh; 1233 bio = xbh;
1235 } 1234 }
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 78082edc14b..4abc193314e 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -989,7 +989,6 @@ static inline void complete_buffers(struct bio *bio, int ok)
989 xbh = bio->bi_next; 989 xbh = bio->bi_next;
990 bio->bi_next = NULL; 990 bio->bi_next = NULL;
991 991
992 blk_finished_io(nr_sectors);
993 bio_endio(bio, nr_sectors << 9, ok ? 0 : -EIO); 992 bio_endio(bio, nr_sectors << 9, ok ? 0 : -EIO);
994 993
995 bio = xbh; 994 bio = xbh;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 79cb9fa8034..593386162f4 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -579,12 +579,6 @@ static inline void blk_clear_queue_full(struct request_queue *q, int rw)
579 (!((rq)->cmd_flags & RQ_NOMERGE_FLAGS) && blk_fs_request((rq))) 579 (!((rq)->cmd_flags & RQ_NOMERGE_FLAGS) && blk_fs_request((rq)))
580 580
581/* 581/*
582 * noop, requests are automagically marked as active/inactive by I/O
583 * scheduler -- see elv_next_request
584 */
585#define blk_queue_headactive(q, head_active)
586
587/*
588 * q->prep_rq_fn return values 582 * q->prep_rq_fn return values
589 */ 583 */
590#define BLKPREP_OK 0 /* serve it */ 584#define BLKPREP_OK 0 /* serve it */
@@ -621,11 +615,6 @@ static inline void blk_queue_bounce(request_queue_t *q, struct bio **bio)
621 if ((rq->bio)) \ 615 if ((rq->bio)) \
622 for (_bio = (rq)->bio; _bio; _bio = _bio->bi_next) 616 for (_bio = (rq)->bio; _bio; _bio = _bio->bi_next)
623 617
624struct sec_size {
625 unsigned block_size;
626 unsigned block_size_bits;
627};
628
629extern int blk_register_queue(struct gendisk *disk); 618extern int blk_register_queue(struct gendisk *disk);
630extern void blk_unregister_queue(struct gendisk *disk); 619extern void blk_unregister_queue(struct gendisk *disk);
631extern void register_disk(struct gendisk *dev); 620extern void register_disk(struct gendisk *dev);
@@ -690,16 +679,6 @@ extern void end_that_request_last(struct request *, int);
690extern void end_request(struct request *req, int uptodate); 679extern void end_request(struct request *req, int uptodate);
691extern void blk_complete_request(struct request *); 680extern void blk_complete_request(struct request *);
692 681
693static inline int rq_all_done(struct request *rq, unsigned int nr_bytes)
694{
695 if (blk_fs_request(rq))
696 return (nr_bytes >= (rq->hard_nr_sectors << 9));
697 else if (blk_pc_request(rq))
698 return nr_bytes >= rq->data_len;
699
700 return 0;
701}
702
703/* 682/*
704 * end_that_request_first/chunk() takes an uptodate argument. we account 683 * end_that_request_first/chunk() takes an uptodate argument. we account
705 * any value <= as an io error. 0 means -EIO for compatability reasons, 684 * any value <= as an io error. 0 means -EIO for compatability reasons,
@@ -807,14 +786,6 @@ static inline int queue_dma_alignment(request_queue_t *q)
807 return retval; 786 return retval;
808} 787}
809 788
810static inline int bdev_dma_aligment(struct block_device *bdev)
811{
812 return queue_dma_alignment(bdev_get_queue(bdev));
813}
814
815#define blk_finished_io(nsects) do { } while (0)
816#define blk_started_io(nsects) do { } while (0)
817
818/* assumes size > 256 */ 789/* assumes size > 256 */
819static inline unsigned int blksize_bits(unsigned int size) 790static inline unsigned int blksize_bits(unsigned int size)
820{ 791{
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 6eafbe30948..9306f63bf77 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -79,7 +79,6 @@ extern int dir_notify_enable;
79#define WRITE 1 79#define WRITE 1
80#define READA 2 /* read-ahead - don't block if no resources */ 80#define READA 2 /* read-ahead - don't block if no resources */
81#define SWRITE 3 /* for ll_rw_block() - wait for buffer lock */ 81#define SWRITE 3 /* for ll_rw_block() - wait for buffer lock */
82#define SPECIAL 4 /* For non-blockdevice requests in request queue */
83#define READ_SYNC (READ | (1 << BIO_RW_SYNC)) 82#define READ_SYNC (READ | (1 << BIO_RW_SYNC))
84#define WRITE_SYNC (WRITE | (1 << BIO_RW_SYNC)) 83#define WRITE_SYNC (WRITE | (1 << BIO_RW_SYNC))
85#define WRITE_BARRIER ((1 << BIO_RW) | (1 << BIO_RW_BARRIER)) 84#define WRITE_BARRIER ((1 << BIO_RW) | (1 << BIO_RW_BARRIER))