History

Merge tag 'for-5.7/drivers-2020-03-29' of git://git.kernel.dk/linux-block

Pull block driver updates from Jens Axboe: - floppy driver cleanup series from Willy - NVMe updates and fixes (Various) - null_blk trace improvements (Chaitanya) - bcache fixes (Coly) - md fixes (via Song) - loop block size change optimizations (Martijn) - scnprintf() use (Takashi) * tag 'for-5.7/drivers-2020-03-29' of git://git.kernel.dk/linux-block: (81 commits) null_blk: add trace in null_blk_zoned.c null_blk: add tracepoint helpers for zoned mode block: add a zone condition debug helper nvme: cleanup namespace identifier reporting in nvme_init_ns_head nvme: rename __nvme_find_ns_head to nvme_find_ns_head nvme: refactor nvme_identify_ns_descs error handling nvme-tcp: Add warning on state change failure at nvme_tcp_setup_ctrl nvme-rdma: Add warning on state change failure at nvme_rdma_setup_ctrl nvme: Fix controller creation races with teardown flow nvme: Make nvme_uninit_ctrl symmetric to nvme_init_ctrl nvme: Fix ctrl use-after-free during sysfs deletion nvme-pci: Re-order nvme_pci_free_ctrl nvme: Remove unused return code from nvme_delete_ctrl_sync nvme: Use nvme_state_terminal helper nvme: release ida resources nvme: Add compat_ioctl handler for NVME_IOCTL_SUBMIT_IO nvmet-tcp: optimize tcp stack TX when data digest is used nvme-fabrics: Use scnprintf() for avoiding potential buffer overflow nvme-multipath: do not reset on unknown status nvmet-rdma: allocate RW ctxs according to mdts ...

Linus Torvalds committed 6 years ago

Commit 15926142 parents 10f36b1 766c32939 files · +1774 −976Browse files

Showing the changes to include/linux (1 of 39 files). Show all

Unified · Split

include/linux/blkdev.h+4−0
@@ -952,6 +952,10 @@ static inline unsigned int blk_rq_stats_sectors(const struct request *rq) · 951 unmodified lines
952}952}
953 953
954#ifdef CONFIG_BLK_DEV_ZONED954#ifdef CONFIG_BLK_DEV_ZONED
955
956/* Helper to convert BLK_ZONE_ZONE_XXX to its string format XXX */
957const char *blk_zone_cond_str(enum blk_zone_cond zone_cond);
958
955static inline unsigned int blk_rq_zone_no(struct request *rq)959static inline unsigned int blk_rq_zone_no(struct request *rq)
956{960{
957 return blk_queue_zone_no(rq->q, blk_rq_pos(rq));961 return blk_queue_zone_no(rq->q, blk_rq_pos(rq));