2022-11-11 08:20:55

by Xiu Jianfeng

Subject: [PATCH -next] scsi: lpfc: Use memset_startat() helper

User memset_startat() helper to simplify the code, no functional
changes in this patch.

Signed-off-by: Xiu Jianfeng <[email protected]>
---
drivers/scsi/lpfc/lpfc_sli.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index d25afc9dde14..35c9404d5e49 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -1373,7 +1373,6 @@ static void
__lpfc_sli_release_iocbq_s4(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
{
struct lpfc_sglq *sglq;
- size_t start_clean = offsetof(struct lpfc_iocbq, wqe);
unsigned long iflag = 0;
struct lpfc_sli_ring *pring;

@@ -1430,7 +1429,7 @@ __lpfc_sli_release_iocbq_s4(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
/*
* Clean all volatile data fields, preserve iotag and node struct.
*/
- memset((char *)iocbq + start_clean, 0, sizeof(*iocbq) - start_clean);
+ memset_startat(iocbq, 0, wqe);
iocbq->sli4_lxritag = NO_XRI;
iocbq->sli4_xritag = NO_XRI;
iocbq->cmd_flag &= ~(LPFC_IO_NVME | LPFC_IO_NVMET | LPFC_IO_CMF |
@@ -1453,12 +1452,11 @@ __lpfc_sli_release_iocbq_s4(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
static void
__lpfc_sli_release_iocbq_s3(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
{
- size_t start_clean = offsetof(struct lpfc_iocbq, iocb);

/*
* Clean all volatile data fields, preserve iotag and node struct.
*/
- memset((char*)iocbq + start_clean, 0, sizeof(*iocbq) - start_clean);
+ memset_startat(iocbq, 0, iocb);
iocbq->sli4_xritag = NO_XRI;
list_add_tail(&iocbq->list, &phba->lpfc_iocb_list);
}
--
2.17.1

2022-11-12 17:24:13

by James Smart

Subject: Re: [PATCH -next] scsi: lpfc: Use memset_startat() helper

On 11/10/2022 11:43 PM, Xiu Jianfeng wrote:
> User memset_startat() helper to simplify the code, no functional
> changes in this patch.
>
> Signed-off-by: Xiu Jianfeng <[email protected]>

Looks good

Reviewed-by: James Smart <[email protected]>

-- james

2022-11-17 19:07:15

by Martin K. Petersen

Subject: Re: [PATCH -next] scsi: lpfc: Use memset_startat() helper

Xiu,

> User memset_startat() helper to simplify the code, no functional
> changes in this patch.

Applied to 6.2/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2022-11-26 04:01:16

by Martin K. Petersen

Subject: Re: [PATCH -next] scsi: lpfc: Use memset_startat() helper

On Fri, 11 Nov 2022 15:43:10 +0800, Xiu Jianfeng wrote:

> User memset_startat() helper to simplify the code, no functional
> changes in this patch.
>
>

Applied to 6.2/scsi-queue, thanks!

[1/1] scsi: lpfc: Use memset_startat() helper
https://git.kernel.org/mkp/scsi/c/b29e91385ce2

--
Martin K. Petersen Oracle Linux Engineering