scsi: fnic: Use vcalloc() instead of vmalloc() and memset(0)
Subsystems (2)
PATCH RESEND v3 1/1 scsi: fnic: Use vcalloc() instead of vmalloc() and memset(0)
Use vcalloc() instead of vmalloc() followed by memset(0) to simplify the functions fnic_trace_buf_init() and fnic_fc_trace_init().
Compile-tested only.
Reviewed-by Johannes Thumshirn <[email protected]>
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/scsi/fnic/fnic_trace.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
drivers/scsi/fnic/fnic_trace.c +3 -13
@@ -485,8 +485,7 @@ int fnic_trace_buf_init(void) } fnic_trace_entries.page_offset = -vmalloc (array_size (fnic_max_trace_entries, -sizeof (unsigned long ))); +vcalloc (fnic_max_trace_entries,sizeof (unsigned long ));if (!fnic_trace_entries.page_offset) { printk(KERN_ERR PFX "Failed to allocate memory for" " page_offset\n");
@@ -497,8 +496,6 @@ int fnic_trace_buf_init(void) err = -ENOMEM ; goto err_fnic_trace_buf_init; } -memset ((void *)fnic_trace_entries.page_offset,0 , - (fnic_max_trace_entries *sizeof (unsigned long ))); fnic_trace_entries.wr_idx = fnic_trace_entries.rd_idx =0 ; fnic_buf_head = fnic_trace_buf_p;
@@ -559,8 +556,7 @@ int fnic_fc_trace_init(void) fc_trace_max_entries = (fnic_fc_trace_max_pages *PAGE_SIZE )/FC_TRC_SIZE_BYTES ; fnic_fc_ctlr_trace_buf_p = - (unsigned long )vmalloc (array_size (PAGE_SIZE , - fnic_fc_trace_max_pages)); + (unsigned long )vcalloc (fnic_fc_trace_max_pages,PAGE_SIZE );if (!fnic_fc_ctlr_trace_buf_p) {pr_err ("fnic: Failed to allocate memory for " "FC Control Trace Buf\n" );
@@ -568,13 +564,9 @@ int fnic_fc_trace_init(void) goto err_fnic_fc_ctlr_trace_buf_init; } -memset ((void *)fnic_fc_ctlr_trace_buf_p,0 , - fnic_fc_trace_max_pages *PAGE_SIZE ); -/* Allocate memory for page offset */ fc_trace_entries.page_offset = -vmalloc (array_size (fc_trace_max_entries, -sizeof (unsigned long ))); +vcalloc (fc_trace_max_entries,sizeof (unsigned long ));if (!fc_trace_entries.page_offset) {pr_err ("fnic:Failed to allocate memory for page_offset\n" );if (fnic_fc_ctlr_trace_buf_p) {
@@ -585,8 +577,6 @@ int fnic_fc_trace_init(void) err = -ENOMEM ; goto err_fnic_fc_ctlr_trace_buf_init; } -memset ((void *)fc_trace_entries.page_offset,0 , - (fc_trace_max_entries *sizeof (unsigned long ))); fc_trace_entries.rd_idx = fc_trace_entries.wr_idx =0 ; fc_trace_buf_head = fnic_fc_ctlr_trace_buf_p;
Signature · 1 line
2.47.0