Conflicts: block/cfq-iosched.c
Showing the changes to include/linux/blkdev.h (1 of 8522 files). Show all
Unified · Split
| @@ -121,6 +121,7 @@ struct request { · 120 unmodified lines | |||
| 121 | }; | 121 | }; |
| 122 | 122 | ||
| 123 | struct gendisk *rq_disk; | 123 | struct gendisk *rq_disk; |
| 124 | struct hd_struct *part; | ||
| 124 | unsigned long start_time; | 125 | unsigned long start_time; |
| 125 | #ifdef CONFIG_BLK_CGROUP | 126 | #ifdef CONFIG_BLK_CGROUP |
| 126 | unsigned long long start_time_ns; | 127 | unsigned long long start_time_ns; |
| @@ -653,7 +654,6 @@ static inline void rq_flush_dcache_pages(struct request *rq) · 526 unmodified lines | |||
| 653 | 654 | ||
| 654 | extern int blk_register_queue(struct gendisk *disk); | 655 | extern int blk_register_queue(struct gendisk *disk); |
| 655 | extern void blk_unregister_queue(struct gendisk *disk); | 656 | extern void blk_unregister_queue(struct gendisk *disk); |
| 656 | extern void register_disk(struct gendisk *dev); | ||
| 657 | extern void generic_make_request(struct bio *bio); | 657 | extern void generic_make_request(struct bio *bio); |
| 658 | extern void blk_rq_init(struct request_queue *q, struct request *rq); | 658 | extern void blk_rq_init(struct request_queue *q, struct request *rq); |
| 659 | extern void blk_put_request(struct request *); | 659 | extern void blk_put_request(struct request *); |
| @@ -1263,6 +1263,9 @@ struct block_device_operations { · 603 unmodified lines | |||
| 1263 | int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); | 1263 | int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); |
| 1264 | int (*direct_access) (struct block_device *, sector_t, | 1264 | int (*direct_access) (struct block_device *, sector_t, |
| 1265 | void **, unsigned long *); | 1265 | void **, unsigned long *); |
| 1266 | unsigned int (*check_events) (struct gendisk *disk, | ||
| 1267 | unsigned int clearing); | ||
| 1268 | /* ->media_changed() is DEPRECATED, use ->check_events() instead */ | ||
| 1266 | int (*media_changed) (struct gendisk *); | 1269 | int (*media_changed) (struct gendisk *); |
| 1267 | void (*unlock_native_capacity) (struct gendisk *); | 1270 | void (*unlock_native_capacity) (struct gendisk *); |
| 1268 | int (*revalidate_disk) (struct gendisk *); | 1271 | int (*revalidate_disk) (struct gendisk *); |