Skip to content

Commit 1f8eb29

Browse files
tobluxmartinkpetersen
authored andcommitted
scsi: target: Remove size arguments when calling strscpy()
The size parameter of strscpy() is optional because strscpy() uses sizeof() to determine the length of the destination buffer if it is not provided as an argument. Remove it to simplify the code. Remove some unnecessary curly braces. No functional changes intended. Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev> Link: https://lore.kernel.org/r/20250304181400.78325-1-thorsten.blum@linux.dev Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent fc8a5ee commit 1f8eb29

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

drivers/target/target_core_configfs.c

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -673,12 +673,10 @@ static ssize_t emulate_model_alias_store(struct config_item *item,
673673
return ret;
674674

675675
BUILD_BUG_ON(sizeof(dev->t10_wwn.model) != INQUIRY_MODEL_LEN + 1);
676-
if (flag) {
676+
if (flag)
677677
dev_set_t10_wwn_model_alias(dev);
678-
} else {
679-
strscpy(dev->t10_wwn.model, dev->transport->inquiry_prod,
680-
sizeof(dev->t10_wwn.model));
681-
}
678+
else
679+
strscpy(dev->t10_wwn.model, dev->transport->inquiry_prod);
682680
da->emulate_model_alias = flag;
683681
return count;
684682
}
@@ -1433,7 +1431,7 @@ static ssize_t target_wwn_vendor_id_store(struct config_item *item,
14331431
ssize_t len;
14341432
ssize_t ret;
14351433

1436-
len = strscpy(buf, page, sizeof(buf));
1434+
len = strscpy(buf, page);
14371435
if (len > 0) {
14381436
/* Strip any newline added from userspace. */
14391437
stripped = strstrip(buf);
@@ -1464,7 +1462,7 @@ static ssize_t target_wwn_vendor_id_store(struct config_item *item,
14641462
}
14651463

14661464
BUILD_BUG_ON(sizeof(dev->t10_wwn.vendor) != INQUIRY_VENDOR_LEN + 1);
1467-
strscpy(dev->t10_wwn.vendor, stripped, sizeof(dev->t10_wwn.vendor));
1465+
strscpy(dev->t10_wwn.vendor, stripped);
14681466

14691467
pr_debug("Target_Core_ConfigFS: Set emulated T10 Vendor Identification:"
14701468
" %s\n", dev->t10_wwn.vendor);
@@ -1489,7 +1487,7 @@ static ssize_t target_wwn_product_id_store(struct config_item *item,
14891487
ssize_t len;
14901488
ssize_t ret;
14911489

1492-
len = strscpy(buf, page, sizeof(buf));
1490+
len = strscpy(buf, page);
14931491
if (len > 0) {
14941492
/* Strip any newline added from userspace. */
14951493
stripped = strstrip(buf);
@@ -1520,7 +1518,7 @@ static ssize_t target_wwn_product_id_store(struct config_item *item,
15201518
}
15211519

15221520
BUILD_BUG_ON(sizeof(dev->t10_wwn.model) != INQUIRY_MODEL_LEN + 1);
1523-
strscpy(dev->t10_wwn.model, stripped, sizeof(dev->t10_wwn.model));
1521+
strscpy(dev->t10_wwn.model, stripped);
15241522

15251523
pr_debug("Target_Core_ConfigFS: Set emulated T10 Model Identification: %s\n",
15261524
dev->t10_wwn.model);
@@ -1545,7 +1543,7 @@ static ssize_t target_wwn_revision_store(struct config_item *item,
15451543
ssize_t len;
15461544
ssize_t ret;
15471545

1548-
len = strscpy(buf, page, sizeof(buf));
1546+
len = strscpy(buf, page);
15491547
if (len > 0) {
15501548
/* Strip any newline added from userspace. */
15511549
stripped = strstrip(buf);
@@ -1576,7 +1574,7 @@ static ssize_t target_wwn_revision_store(struct config_item *item,
15761574
}
15771575

15781576
BUILD_BUG_ON(sizeof(dev->t10_wwn.revision) != INQUIRY_REVISION_LEN + 1);
1579-
strscpy(dev->t10_wwn.revision, stripped, sizeof(dev->t10_wwn.revision));
1577+
strscpy(dev->t10_wwn.revision, stripped);
15801578

15811579
pr_debug("Target_Core_ConfigFS: Set emulated T10 Revision: %s\n",
15821580
dev->t10_wwn.revision);

0 commit comments

Comments
 (0)