diff options
| author |   Jens Axboe <jaxboe@fusionio.com> | 2011-01-13 14:47:54 +0100 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-01-13 14:47:54 +0100 |
| commit | 81c5e2ae33c4b19e53966b427e33646bf6811830 (patch) | |
| tree | a602a6dd100165c8948bfa713e6f0b422dcba5d8 /include/linux/blkdev.h | |
| parent | block: ensure that completion error gets properly traced (diff) | |
| parent | Revert "sd: implement sd_check_events()" (diff) | |
| download | linux-dev-81c5e2ae33c4b19e53966b427e33646bf6811830.tar.xz linux-dev-81c5e2ae33c4b19e53966b427e33646bf6811830.zip | |
Merge branch 'for-2.6.38/event-handling' into for-2.6.38/core
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 482a7fd48831..5730043eb15a 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -644,7 +644,6 @@ static inline void rq_flush_dcache_pages(struct request *rq) extern int blk_register_queue(struct gendisk *disk); extern void blk_unregister_queue(struct gendisk *disk); -extern void register_disk(struct gendisk *dev); extern void generic_make_request(struct bio *bio); extern void blk_rq_init(struct request_queue *q, struct request *rq); extern void blk_put_request(struct request *); @@ -1253,6 +1252,9 @@ struct block_device_operations { int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); int (*direct_access) (struct block_device *, sector_t, void **, unsigned long *); + unsigned int (*check_events) (struct gendisk *disk, + unsigned int clearing); + /* ->media_changed() is DEPRECATED, use ->check_events() instead */ int (*media_changed) (struct gendisk *); void (*unlock_native_capacity) (struct gendisk *); int (*revalidate_disk) (struct gendisk *); |