scsi: target: Simplify target_lu_gp_members_show()
Remove the stack buffer 'buf'. This patch does not modify the output produced by target_lu_gp_members_show(). An example of the output that is produced with this patch applied: $ cat /sys/kernel/config/target/core/alua/lu_gps/default_lu_gp/members fileio_0/vdev0 fileio_1/vdev1 iblock_0/vdev2 $ od -c /sys/kernel/config/target/core/alua/lu_gps/default_lu_gp/members 0000000 f i l e i o _ 0 / v d e v 0 \n f 0000020 i l e i o _ 1 / v d e v 1 \n i b 0000040 l o c k _ 0 / v d e v 2 \n 0000055 Signed-off-by: Bart Van Assche <bvanassche@acm.org> Link: https://patch.msgid.link/20251027184639.3501254-3-bvanassche@acm.org Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
committed by
Martin K. Petersen
parent
c03b55f235
commit
f010c39ae1
@@ -2773,32 +2773,24 @@ static ssize_t target_lu_gp_lu_gp_id_store(struct config_item *item,
|
|||||||
static ssize_t target_lu_gp_members_show(struct config_item *item, char *page)
|
static ssize_t target_lu_gp_members_show(struct config_item *item, char *page)
|
||||||
{
|
{
|
||||||
struct t10_alua_lu_gp *lu_gp = to_lu_gp(item);
|
struct t10_alua_lu_gp *lu_gp = to_lu_gp(item);
|
||||||
struct se_device *dev;
|
|
||||||
struct se_hba *hba;
|
|
||||||
struct t10_alua_lu_gp_member *lu_gp_mem;
|
struct t10_alua_lu_gp_member *lu_gp_mem;
|
||||||
ssize_t len = 0, cur_len;
|
const char *const end = page + PAGE_SIZE;
|
||||||
unsigned char buf[LU_GROUP_NAME_BUF] = { };
|
char *cur = page;
|
||||||
|
|
||||||
spin_lock(&lu_gp->lu_gp_lock);
|
spin_lock(&lu_gp->lu_gp_lock);
|
||||||
list_for_each_entry(lu_gp_mem, &lu_gp->lu_gp_mem_list, lu_gp_mem_list) {
|
list_for_each_entry(lu_gp_mem, &lu_gp->lu_gp_mem_list, lu_gp_mem_list) {
|
||||||
dev = lu_gp_mem->lu_gp_mem_dev;
|
struct se_device *dev = lu_gp_mem->lu_gp_mem_dev;
|
||||||
hba = dev->se_hba;
|
struct se_hba *hba = dev->se_hba;
|
||||||
|
|
||||||
cur_len = snprintf(buf, LU_GROUP_NAME_BUF, "%s/%s\n",
|
cur += scnprintf(cur, end - cur, "%s/%s\n",
|
||||||
config_item_name(&hba->hba_group.cg_item),
|
config_item_name(&hba->hba_group.cg_item),
|
||||||
config_item_name(&dev->dev_group.cg_item));
|
config_item_name(&dev->dev_group.cg_item));
|
||||||
|
if (WARN_ON_ONCE(cur >= end))
|
||||||
if ((cur_len + len) > PAGE_SIZE || cur_len > LU_GROUP_NAME_BUF) {
|
|
||||||
pr_warn("Ran out of lu_gp_show_attr"
|
|
||||||
"_members buffer\n");
|
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
memcpy(page+len, buf, cur_len);
|
|
||||||
len += cur_len;
|
|
||||||
}
|
}
|
||||||
spin_unlock(&lu_gp->lu_gp_lock);
|
spin_unlock(&lu_gp->lu_gp_lock);
|
||||||
|
|
||||||
return len;
|
return cur - page;
|
||||||
}
|
}
|
||||||
|
|
||||||
CONFIGFS_ATTR(target_lu_gp_, lu_gp_id);
|
CONFIGFS_ATTR(target_lu_gp_, lu_gp_id);
|
||||||
|
|||||||
Reference in New Issue
Block a user