nvmet: configfs small cleanup
Subsystems (2)
Chaitanya Kulkarni
maintainercover nvmet: configfs small cleanup
Hi,
This has small-cleanup for target configfs.c.
-ck
Chaitanya Kulkarni (2):
nvmet: don't fold lines
nvmet: use snprintf() with PAGE_SIZE in configfs
drivers/nvme/target/configfs.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
Signature · 1 line
2.29.0
Chaitanya Kulkarni
maintainerPATCH 1/2 nvmet: don't fold lines
Don't fold line that can fit into 80 char limit. No functional change in this patch.
Signed-off-by Chaitanya Kulkarni <[email protected]>
--- drivers/nvme/target/configfs.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/nvme/target/configfs.c +5 -9
@@ -93,10 +93,9 @@ CONFIGFS_ATTR(nvmet_, addr_adrfam);static ssize_t nvmet_addr_portid_show (struct config_item *item,char *page) { -struct nvmet_port *port =to_nvmet_port (item); +__le16 portid =to_nvmet_port (item)->disc_addr.portid; -return snprintf (page,PAGE_SIZE ,"%d\n" , -le16_to_cpu (port->disc_addr.portid)); +return snprintf (page,PAGE_SIZE ,"%d\n" ,le16_to_cpu (portid)); } static ssize_t nvmet_addr_portid_store(struct config_item *item,
@@ -124,8 +123,7 @@ static ssize_t nvmet_addr_traddr_show(struct config_item *item, {struct nvmet_port *port =to_nvmet_port (item); -return snprintf (page,PAGE_SIZE ,"%s\n" , - port->disc_addr.traddr); +return snprintf (page,PAGE_SIZE ,"%s\n" , port->disc_addr.traddr); } static ssize_t nvmet_addr_traddr_store(struct config_item *item,
@@ -199,8 +197,7 @@ static ssize_t nvmet_addr_trsvcid_show(struct config_item *item, {struct nvmet_port *port =to_nvmet_port (item); -return snprintf (page,PAGE_SIZE ,"%s\n" , - port->disc_addr.trsvcid); +return snprintf (page,PAGE_SIZE ,"%s\n" , port->disc_addr.trsvcid); } static ssize_t nvmet_addr_trsvcid_store(struct config_item *item,
@@ -1236,8 +1233,7 @@ CONFIGFS_ATTR(nvmet_subsys_, attr_model);static ssize_t nvmet_subsys_attr_discovery_nqn_show (struct config_item *item,char *page) { -return snprintf (page,PAGE_SIZE ,"%s\n" , - nvmet_disc_subsys->subsysnqn); +return snprintf (page,PAGE_SIZE ,"%s\n" , nvmet_disc_subsys->subsysnqn); } static ssize_t nvmet_subsys_attr_discovery_nqn_store(struct config_item *item,
Signature · 1 line
2.29.0
Chaitanya Kulkarni
maintainerPATCH 2/2 nvmet: use snprintf() with PAGE_SIZE in configfs
In reply to Chaitanya KulkarniInstead of using sprintf, use snprintf with buffer size limited to PAGE_SIZE just like what we have for the rest of the file.
Signed-off-by Chaitanya Kulkarni <[email protected]>
--- drivers/nvme/target/configfs.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/nvme/target/configfs.c +8 -5
@@ -60,10 +60,11 @@ static ssize_t nvmet_addr_adrfam_show(struct config_item *item, char *page)for (i =1 ; i <ARRAY_SIZE (nvmet_addr_family); i++) {if (nvmet_addr_family[i].type == adrfam) -return sprintf (page,"%s\n" , nvmet_addr_family[i].name); +return snprintf (page,PAGE_SIZE ,"%s\n" , + nvmet_addr_family[i].name); } -return sprintf (page,"\n" ); +return snprintf (page,PAGE_SIZE ,"\n" ); } static ssize_t nvmet_addr_adrfam_store(struct config_item *item,
@@ -160,10 +161,11 @@ static ssize_t nvmet_addr_treq_show(struct config_item *item, char *page)for (i =0 ; i <ARRAY_SIZE (nvmet_addr_treq); i++) {if (treq == nvmet_addr_treq[i].type) -return sprintf (page,"%s\n" , nvmet_addr_treq[i].name); +return snprintf (page,PAGE_SIZE ,"%s\n" , + nvmet_addr_treq[i].name); } -return sprintf (page,"\n" ); +return snprintf (page,PAGE_SIZE ,"\n" ); } static ssize_t nvmet_addr_treq_store(struct config_item *item,
@@ -281,7 +283,8 @@ static ssize_t nvmet_addr_trtype_show(struct config_item *item,for (i =0 ; i <ARRAY_SIZE (nvmet_transport); i++) {if (port->disc_addr.trtype == nvmet_transport[i].type) -return sprintf (page,"%s\n" , nvmet_transport[i].name); +return snprintf (page,PAGE_SIZE , +"%s\n" , nvmet_transport[i].name); }return sprintf (page,"\n" );
Signature · 1 line
2.29.0
Thanks,
applied to nvme-5.18.