diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 2 | ||||
| -rw-r--r-- | include/linux/fs.h | 3 | ||||
| -rw-r--r-- | include/linux/genhd.h | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 62cd5652cf8c..c202131adc1f 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -312,7 +312,7 @@ 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; + return bdev->bd_disk->queue; } /* diff --git a/include/linux/fs.h b/include/linux/fs.h index c2e39a247227..d039e51f5b81 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -348,8 +348,6 @@ struct block_device { struct inode * bd_inode; dev_t bd_dev; /* not a kdev_t - it's a search key */ int bd_openers; - struct block_device_operations *bd_op; - struct request_queue *bd_queue; struct semaphore bd_sem; /* open/close mutex */ struct list_head bd_inodes; void * bd_holder; @@ -1096,7 +1094,6 @@ extern void bd_release(struct block_device *); extern void blk_run_queues(void); /* fs/devices.c */ -extern struct block_device_operations *get_blkfops(unsigned int); extern int register_chrdev(unsigned int, const char *, struct file_operations *); extern int unregister_chrdev(unsigned int, const char *); extern int chrdev_open(struct inode *, struct file *); diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 2b0ab92e65db..6e40442fa80c 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -282,7 +282,7 @@ extern void put_disk(struct gendisk *disk); extern void blk_register_region(dev_t dev, unsigned long range, struct module *module, struct gendisk *(*probe)(dev_t, int *, void *), - void (*lock)(dev_t, void *), + int (*lock)(dev_t, void *), void *data); extern void blk_unregister_region(dev_t dev, unsigned long range); |