Skip to content

Commit 8d88cf3

Browse files
Christof SchmittJames Bottomley
authored andcommitted
[SCSI] zfcp: Update status read mempool
Commit 64deb6e changed the way status read buffers are handled but forgot to adjust the mempool to the new size. Add the call to resize the mempool after the exchange config data. Also use the define instead of the hard coded number in the fsf callback for consistency. Reviewed-by: Swen Schillig <swen@vnet.ibm.com> Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
1 parent c2af754 commit 8d88cf3

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

drivers/s390/scsi/zfcp_erp.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,14 @@ static int zfcp_erp_adapter_strategy_open_fsf(struct zfcp_erp_action *act)
714714
if (zfcp_erp_adapter_strategy_open_fsf_xport(act) == ZFCP_ERP_FAILED)
715715
return ZFCP_ERP_FAILED;
716716

717+
if (mempool_resize(act->adapter->pool.status_read_data,
718+
act->adapter->stat_read_buf_num, GFP_KERNEL))
719+
return ZFCP_ERP_FAILED;
720+
721+
if (mempool_resize(act->adapter->pool.status_read_req,
722+
act->adapter->stat_read_buf_num, GFP_KERNEL))
723+
return ZFCP_ERP_FAILED;
724+
717725
atomic_set(&act->adapter->stat_miss, act->adapter->stat_read_buf_num);
718726
if (zfcp_status_read_refill(act->adapter))
719727
return ZFCP_ERP_FAILED;

drivers/s390/scsi/zfcp_fsf.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,8 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)
496496

497497
adapter->hydra_version = bottom->adapter_type;
498498
adapter->timer_ticks = bottom->timer_interval;
499-
adapter->stat_read_buf_num = max(bottom->status_read_buf_num, (u16)16);
499+
adapter->stat_read_buf_num = max(bottom->status_read_buf_num,
500+
(u16)FSF_STATUS_READS_RECOM);
500501

501502
if (fc_host_permanent_port_name(shost) == -1)
502503
fc_host_permanent_port_name(shost) = fc_host_port_name(shost);

0 commit comments

Comments
 (0)