diff options
| author | Jens Axboe <axboe@fb.com> | 2015-01-14 07:58:45 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-01-14 07:58:45 +0300 |
| commit | d4119ee0e1aa2b74e5e367cbc915e79db7b9e271 (patch) | |
| tree | dae4e7bebdda0db62a00c5bb3d054a6018d68444 /include | |
| parent | 91117a20245b59f70b563523edbf998a62fc6383 (diff) | |
| parent | dd22f551ac0ad366f92f601835f6623b83adc331 (diff) | |
| download | linux-d4119ee0e1aa2b74e5e367cbc915e79db7b9e271.tar.xz | |
Merge branch 'for-3.20/core' into for-3.20/drivers
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 92f4b4b288dd..e9086be6d9a0 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1601,8 +1601,8 @@ struct block_device_operations { int (*rw_page)(struct block_device *, sector_t, struct page *, int rw); int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); - int (*direct_access) (struct block_device *, sector_t, - void **, unsigned long *); + long (*direct_access)(struct block_device *, sector_t, + void **, unsigned long *pfn, long size); unsigned int (*check_events) (struct gendisk *disk, unsigned int clearing); /* ->media_changed() is DEPRECATED, use ->check_events() instead */ @@ -1620,6 +1620,8 @@ extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, extern int bdev_read_page(struct block_device *, sector_t, struct page *); extern int bdev_write_page(struct block_device *, sector_t, struct page *, struct writeback_control *); +extern long bdev_direct_access(struct block_device *, sector_t, void **addr, + unsigned long *pfn, long size); #else /* CONFIG_BLOCK */ struct block_device; |