[PATCH 0/2] cleanup

[PATCH 0/2] cleanup

[Kanchan Joshi]

First patch removes two unused variables.
Second one reduces repeated checking.

Kanchan Joshi (2):
  nvme: remove sgs and sws
  nvme: reduce a repeated ZNS check

 drivers/nvme/host/core.c | 9 +++++----
 drivers/nvme/host/nvme.h | 2 --
 2 files changed, 5 insertions(+), 6 deletions(-)

-- 
2.25.1

[PATCH 1/2] nvme: remove sgs and sws

[Kanchan Joshi]

sgs/sws are unused, so remove these from nvme_ns_head structure.

Signed-off-by: Kanchan Joshi <joshi.k@samsung.com>
---
 drivers/nvme/host/nvme.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index d0ed64dc7380..22a9992a4525 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -466,8 +466,6 @@ struct nvme_ns_head {
 	u8			pi_type;
 	u8			pi_offset;
 	u8			guard_type;
-	u16			sgs;
-	u32			sws;
 #ifdef CONFIG_BLK_DEV_ZONED
 	u64			zsze;
 #endif
-- 
2.25.1

[PATCH 2/2] nvme: reduce a repeated ZNS check

[Kanchan Joshi]

Modify nvme_update_ns_info_block() to eliminate the repeated check for
ZNS.

Signed-off-by: Kanchan Joshi <joshi.k@samsung.com>
---
 drivers/nvme/host/core.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 8ae0a2dc5eda..7f4df3932ca4 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2081,6 +2081,7 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns,
 	sector_t capacity;
 	unsigned lbaf;
 	int ret;
+	bool is_zns;
 
 	ret = nvme_identify_ns(ns->ctrl, info->nsid, &id);
 	if (ret)
@@ -2100,8 +2101,9 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns,
 			goto out;
 	}
 
-	if (IS_ENABLED(CONFIG_BLK_DEV_ZONED) &&
-	    ns->head->ids.csi == NVME_CSI_ZNS) {
+	is_zns = IS_ENABLED(CONFIG_BLK_DEV_ZONED) &&
+		 ns->head->ids.csi == NVME_CSI_ZNS;
+	if (is_zns) {
 		ret = nvme_query_zone_info(ns, lbaf, &zi);
 		if (ret < 0)
 			goto out;
@@ -2119,8 +2121,7 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns,
 	if (!nvme_update_disk_info(ns, id, &lim))
 		capacity = 0;
 	nvme_config_discard(ns, &lim);
-	if (IS_ENABLED(CONFIG_BLK_DEV_ZONED) &&
-	    ns->head->ids.csi == NVME_CSI_ZNS)
+	if (is_zns)
 		nvme_update_zone_info(ns, &lim, &zi);
 	ret = queue_limits_commit_update(ns->disk->queue, &lim);
 	if (ret) {
-- 
2.25.1

Re: [PATCH 1/2] nvme: remove sgs and sws

[Christoph Hellwig]

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH 2/2] nvme: reduce a repeated ZNS check

[Christoph Hellwig]

On Thu, May 02, 2024 at 12:04:38PM +0530, Kanchan Joshi wrote:
> Modify nvme_update_ns_info_block() to eliminate the repeated check for
> ZNS.

Not sure there is much of a point do de-duplicate two instances of
compile time condition + trivial const comparison?

Re: [PATCH 2/2] nvme: reduce a repeated ZNS check

[Kanchan Joshi]

On 5/2/2024 12:43 PM, Christoph Hellwig wrote:
> Not sure there is much of a point do de-duplicate two instances of
> compile time condition + trivial const comparison?
> 

I also don't see it as a [micro] optimization. But this if condition 
seemed too long to be present twice.

Re: [PATCH 1/2] nvme: remove sgs and sws

[Sagi Grimberg]

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>

Re: [PATCH 2/2] nvme: reduce a repeated ZNS check

[Sagi Grimberg]

On 5/2/24 11:44, Kanchan Joshi wrote:
> On 5/2/2024 12:43 PM, Christoph Hellwig wrote:
>> Not sure there is much of a point do de-duplicate two instances of
>> compile time condition + trivial const comparison?
>>
> I also don't see it as a [micro] optimization. But this if condition
> seemed too long to be present twice.

Seems a bit redundant to me.