History

block: remove block_device_operations ->direct_access()

Now that all the producers and consumers of dax interfaces have been converted to using dax_operations on a dax_device, remove the block device direct_access enabling.

Dan Williams committed 9 years ago

Commit d4b29fd1 parent 2093f2e7 files · +4 −135Browse files

Showing the changes to include/linux/blkdev.h (1 of 7 files). Show all

Unified · Split

include/linux/blkdev.h+0−17
@@ -1916,28 +1916,12 @@ static inline bool integrity_req_gap_front_merge(struct request *req, · 1915 unmodified lines
1916 1916
1917#endif /* CONFIG_BLK_DEV_INTEGRITY */1917#endif /* CONFIG_BLK_DEV_INTEGRITY */
1918 1918
1919/**
1920 * struct blk_dax_ctl - control and output parameters for ->direct_access
1921 * @sector: (input) offset relative to a block_device
1922 * @addr: (output) kernel virtual address for @sector populated by driver
1923 * @pfn: (output) page frame number for @addr populated by driver
1924 * @size: (input) number of bytes requested
1925 */
1926struct blk_dax_ctl {
1927 sector_t sector;
1928 void *addr;
1929 long size;
1930 pfn_t pfn;
1931};
1932
1933struct block_device_operations {1919struct block_device_operations {
1934 int (*open) (struct block_device *, fmode_t);1920 int (*open) (struct block_device *, fmode_t);
1935 void (*release) (struct gendisk *, fmode_t);1921 void (*release) (struct gendisk *, fmode_t);
1936 int (*rw_page)(struct block_device *, sector_t, struct page *, bool);1922 int (*rw_page)(struct block_device *, sector_t, struct page *, bool);
1937 int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);1923 int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
1938 int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);1924 int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
1939 long (*direct_access)(struct block_device *, sector_t, void **, pfn_t *,
1940 long);
1941 unsigned int (*check_events) (struct gendisk *disk,1925 unsigned int (*check_events) (struct gendisk *disk,
1942 unsigned int clearing);1926 unsigned int clearing);
1943 /* ->media_changed() is DEPRECATED, use ->check_events() instead */1927 /* ->media_changed() is DEPRECATED, use ->check_events() instead */
@@ -1956,7 +1940,6 @@ extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, · 12 unmodified lines
1956extern int bdev_read_page(struct block_device *, sector_t, struct page *);1940extern int bdev_read_page(struct block_device *, sector_t, struct page *);
1957extern int bdev_write_page(struct block_device *, sector_t, struct page *,1941extern int bdev_write_page(struct block_device *, sector_t, struct page *,
1958 struct writeback_control *);1942 struct writeback_control *);
1959extern long bdev_direct_access(struct block_device *, struct blk_dax_ctl *);
1960extern int bdev_dax_supported(struct super_block *, int);1943extern int bdev_dax_supported(struct super_block *, int);
1961int bdev_dax_pgoff(struct block_device *, sector_t, size_t, pgoff_t *pgoff);1944int bdev_dax_pgoff(struct block_device *, sector_t, size_t, pgoff_t *pgoff);
1962#else /* CONFIG_BLOCK */1945#else /* CONFIG_BLOCK */