diff options
| author |   Damien Le Moal <damien.lemoal@wdc.com> | 2019-10-21 12:40:03 +0900 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2019-11-04 10:56:41 -0700 |
| commit | 314d48dd224897e35ddcaf5a1d7d133b5adddeb7 (patch) | |
| tree | dbf7238ea8feb0078a99ec38094f4a1416ad8cdf /drivers/nvme/host/nvme.h | |
| parent | nvme: resync include/linux/nvme.h with nvmecli (diff) | |
| download | linux-dev-314d48dd224897e35ddcaf5a1d7d133b5adddeb7.tar.xz linux-dev-314d48dd224897e35ddcaf5a1d7d133b5adddeb7.zip | |
nvme: Cleanup and rename nvme_block_nr()
Rename nvme_block_nr() to nvme_sect_to_lba() and use SECTOR_SHIFT
instead of its hard coded value 9. Also add a comment to decribe this
helper.
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
| -rw-r--r-- | drivers/nvme/host/nvme.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 912f9500ed11..37eb94fb797d 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -418,9 +418,12 @@ static inline int nvme_reset_subsystem(struct nvme_ctrl *ctrl) return ctrl->ops->reg_write32(ctrl, NVME_REG_NSSR, 0x4E564D65); } -static inline u64 nvme_block_nr(struct nvme_ns *ns, sector_t sector) +/* + * Convert a 512B sector number to a device logical block number. + */ +static inline u64 nvme_sect_to_lba(struct nvme_ns *ns, sector_t sector) { - return (sector >> (ns->lba_shift - 9)); + return sector >> (ns->lba_shift - SECTOR_SHIFT); } static inline void nvme_end_request(struct request *req, __le16 status, |