openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

nvmet: change ppl to lpp 

In nvmet_bdev_set_limits() the number of logical blocks per
physical block is calculated, but the opposite is mentioned in
the associated comment and reflected in the variable name. Correct
the comment and adjust the variable name to reflect the calculation
done.

Signed-off-by: John Pittman <jpittman@redhat.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
This commit is contained in:
John Pittman 2019-09-17 14:52:00 -04:00 committed by Sagi Grimberg
parent d46fe2cb2d
commit 0ec64895b0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/nvme/target/io-cmd-bdev.c
View File

@ -11,10 +11,10 @@
void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id) void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id)
{ {
const struct queue_limits *ql = &bdev_get_queue(bdev)->limits; const struct queue_limits *ql = &bdev_get_queue(bdev)->limits;
/* Number of physical blocks per logical block. */ /* Number of logical blocks per physical block. */
const u32 ppl = ql->physical_block_size / ql->logical_block_size; const u32 lpp = ql->physical_block_size / ql->logical_block_size;
/* Physical blocks per logical block, 0's based. */ /* Logical blocks per physical block, 0's based. */
const __le16 ppl0b = to0based(ppl); const __le16 lpp0b = to0based(lpp);
/* /*
* For NVMe 1.2 and later, bit 1 indicates that the fields NAWUN, * For NVMe 1.2 and later, bit 1 indicates that the fields NAWUN,
@ -25,9 +25,9 @@ void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id)
* field from the identify controller data structure should be used. * field from the identify controller data structure should be used.
*/ */
id->nsfeat |= 1 << 1; id->nsfeat |= 1 << 1;
id->nawun = ppl0b; id->nawun = lpp0b;
id->nawupf = ppl0b; id->nawupf = lpp0b;
id->nacwu = ppl0b; id->nacwu = lpp0b;
/* /*
* Bit 4 indicates that the fields NPWG, NPWA, NPDG, NPDA, and * Bit 4 indicates that the fields NPWG, NPWA, NPDG, NPDA, and
@ -36,7 +36,7 @@ void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id)
*/ */
id->nsfeat |= 1 << 4; id->nsfeat |= 1 << 4;
/* NPWG = Namespace Preferred Write Granularity. 0's based */ /* NPWG = Namespace Preferred Write Granularity. 0's based */
id->npwg = ppl0b; id->npwg = lpp0b;
/* NPWA = Namespace Preferred Write Alignment. 0's based */ /* NPWA = Namespace Preferred Write Alignment. 0's based */
id->npwa = id->npwg; id->npwa = id->npwg;
/* NPDG = Namespace Preferred Deallocate Granularity. 0's based */ /* NPDG = Namespace Preferred Deallocate Granularity. 0's based */