Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8d88cf3f3b9af4713642caeb221b6d6a42019001

Authored by Christof Schmitt
Committed by James Bottomley
1 parent c2af7545aa
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SCSI] zfcp: Update status read mempool 

Commit 64deb6efdc5504ce97b5c1c6f281fffbc150bd93 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>

Showing 2 changed files with 10 additions and 1 deletions Side-by-side Diff

drivers/s390/scsi/zfcp_erp.c
Diff comments   View file @ 8d88cf3
... ... @@ -714,6 +714,14 @@
714 714 if (zfcp_erp_adapter_strategy_open_fsf_xport(act) == ZFCP_ERP_FAILED)
715 715 return ZFCP_ERP_FAILED;
716 716  
  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 +
717 725 atomic_set(&act->adapter->stat_miss, act->adapter->stat_read_buf_num);
718 726 if (zfcp_status_read_refill(act->adapter))
719 727 return ZFCP_ERP_FAILED;
drivers/s390/scsi/zfcp_fsf.c
Diff comments   View file @ 8d88cf3
... ... @@ -496,7 +496,8 @@
496 496  
497 497 adapter->hydra_version = bottom->adapter_type;
498 498 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);
500 501  
501 502 if (fc_host_permanent_port_name(shost) == -1)
502 503 fc_host_permanent_port_name(shost) = fc_host_port_name(shost);