Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d88cf3f authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Update status read mempool 



Commit 64deb6ef 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: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent c2af7545

drivers/s390/scsi/zfcp_erp.c

+8 −0
Original line number Diff line number Diff line
@@ -714,6 +714,14 @@ static int zfcp_erp_adapter_strategy_open_fsf(struct zfcp_erp_action *act) 
	if (zfcp_erp_adapter_strategy_open_fsf_xport(act) == ZFCP_ERP_FAILED)

		return ZFCP_ERP_FAILED;



	if (mempool_resize(act->adapter->pool.status_read_data,

			   act->adapter->stat_read_buf_num, GFP_KERNEL))

		return ZFCP_ERP_FAILED;



	if (mempool_resize(act->adapter->pool.status_read_req,

			   act->adapter->stat_read_buf_num, GFP_KERNEL))

		return ZFCP_ERP_FAILED;



	atomic_set(&act->adapter->stat_miss, act->adapter->stat_read_buf_num);

	if (zfcp_status_read_refill(act->adapter))

		return ZFCP_ERP_FAILED;

drivers/s390/scsi/zfcp_fsf.c

+2 −1
Original line number Diff line number Diff line
@@ -496,7 +496,8 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req) 


	adapter->hydra_version = bottom->adapter_type;

	adapter->timer_ticks = bottom->timer_interval;

	adapter->stat_read_buf_num = max(bottom->status_read_buf_num, (u16)16);

	adapter->stat_read_buf_num = max(bottom->status_read_buf_num,

					 (u16)FSF_STATUS_READS_RECOM);



	if (fc_host_permanent_port_name(shost) == -1)

		fc_host_permanent_port_name(shost) = fc_host_port_name(shost);