diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-18 09:33:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-18 09:33:27 -0700 |
| commit | e366fa435032db1ce1538a2c029714666985dd48 (patch) | |
| tree | d08bab02ba212339e4cfc0f2e3666435dd795b90 /drivers/block/null_blk.h | |
| parent | cf7d97e1e54d71679a8b11716dad9d21deb0e1e2 (diff) | |
| parent | 5211da9ca526a5adddee1ccd078e6e33a583ab36 (diff) | |
| download | talos-op-linux-e366fa435032db1ce1538a2c029714666985dd48.tar.gz talos-op-linux-e366fa435032db1ce1538a2c029714666985dd48.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Two new tls tests added in parallel in both net and net-next.
Used Stephen Rothwell's linux-next resolution.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/block/null_blk.h')
| -rw-r--r-- | drivers/block/null_blk.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/block/null_blk.h b/drivers/block/null_blk.h index d81781f22dba..34e0030f0592 100644 --- a/drivers/block/null_blk.h +++ b/drivers/block/null_blk.h @@ -87,10 +87,10 @@ struct nullb { #ifdef CONFIG_BLK_DEV_ZONED int null_zone_init(struct nullb_device *dev); void null_zone_exit(struct nullb_device *dev); -blk_status_t null_zone_report(struct nullb *nullb, - struct nullb_cmd *cmd); -void null_zone_write(struct nullb_cmd *cmd); -void null_zone_reset(struct nullb_cmd *cmd); +blk_status_t null_zone_report(struct nullb *nullb, struct bio *bio); +void null_zone_write(struct nullb_cmd *cmd, sector_t sector, + unsigned int nr_sectors); +void null_zone_reset(struct nullb_cmd *cmd, sector_t sector); #else static inline int null_zone_init(struct nullb_device *dev) { @@ -98,11 +98,14 @@ static inline int null_zone_init(struct nullb_device *dev) } static inline void null_zone_exit(struct nullb_device *dev) {} static inline blk_status_t null_zone_report(struct nullb *nullb, - struct nullb_cmd *cmd) + struct bio *bio) { return BLK_STS_NOTSUPP; } -static inline void null_zone_write(struct nullb_cmd *cmd) {} -static inline void null_zone_reset(struct nullb_cmd *cmd) {} +static inline void null_zone_write(struct nullb_cmd *cmd, sector_t sector, + unsigned int nr_sectors) +{ +} +static inline void null_zone_reset(struct nullb_cmd *cmd, sector_t sector) {} #endif /* CONFIG_BLK_DEV_ZONED */ #endif /* __NULL_BLK_H */ |
