scsi: fnic: Use vzalloc() instead of vmalloc() and memset(0)
Subsystems (2)
PATCH RESEND 1/1 scsi: fnic: Use vzalloc() instead of vmalloc() and memset(0)
Use vzalloc() instead of vmalloc() followed by memset(0) to simplify the functions fnic_trace_buf_init() and fnic_fc_trace_init().
Compile-tested only.
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/scsi/fnic/fnic_trace.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/scsi/fnic/fnic_trace.c +3 -10
@@ -485,7 +485,7 @@ int fnic_trace_buf_init(void) } fnic_trace_entries.page_offset = -vmalloc (array_size (fnic_max_trace_entries, +vzalloc (array_size (fnic_max_trace_entries,sizeof (unsigned long )));if (!fnic_trace_entries.page_offset) { printk(KERN_ERR PFX "Failed to allocate memory for"
@@ -497,8 +497,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,7 +557,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 , + (unsigned long )vzalloc (array_size (PAGE_SIZE , fnic_fc_trace_max_pages));if (!fnic_fc_ctlr_trace_buf_p) { pr_err("fnic: Failed to allocate memory for "
@@ -568,12 +566,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, +vzalloc (array_size (fc_trace_max_entries,sizeof (unsigned long )));if (!fc_trace_entries.page_offset) {pr_err ("fnic:Failed to allocate memory for page_offset\n" );
@@ -585,8 +580,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.46.2
drivers/scsi/fnic/fnic_trace.c int fnic_fc_trace_init(void) · line 561
Quoted 7 lines · Thorsten Blum
drivers/scsi/fnic/fnic_trace.c +1
-1@@ -559,7 +557,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 , + (unsigned long )vzalloc (array_size (PAGE_SIZE , fnic_fc_trace_max_pages));
Casting the vzalloc() shouldn't be needed.