[PATCH] ibmvnic: fix to use list_for_each_safe() when delete items

Thomas Falcon tlfalcon at linux.vnet.ibm.com
Tue Jun 21 01:50:26 AEST 2016


On 06/17/2016 09:53 PM, weiyj_lk at 163.com wrote:
> From: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
>
> Since we will remove items off the list using list_del() we need
> to use a safe version of the list_for_each() macro aptly named
> list_for_each_safe().
>
> Signed-off-by: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
> ---
>  drivers/net/ethernet/ibm/ibmvnic.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
> index 864cb21..0b6a922 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.c
> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
> @@ -3141,14 +3141,14 @@ static void handle_request_ras_comp_num_rsp(union ibmvnic_crq *crq,
>  
>  static void ibmvnic_free_inflight(struct ibmvnic_adapter *adapter)
>  {
> -	struct ibmvnic_inflight_cmd *inflight_cmd;
> +	struct ibmvnic_inflight_cmd *inflight_cmd, *tmp1;
>  	struct device *dev = &adapter->vdev->dev;
> -	struct ibmvnic_error_buff *error_buff;
> +	struct ibmvnic_error_buff *error_buff, *tmp2;
>  	unsigned long flags;
>  	unsigned long flags2;
>  
>  	spin_lock_irqsave(&adapter->inflight_lock, flags);
> -	list_for_each_entry(inflight_cmd, &adapter->inflight, list) {
> +	list_for_each_entry_safe(inflight_cmd, tmp1, &adapter->inflight, list) {
>  		switch (inflight_cmd->crq.generic.cmd) {
>  		case LOGIN:
>  			dma_unmap_single(dev, adapter->login_buf_token,
> @@ -3165,8 +3165,8 @@ static void ibmvnic_free_inflight(struct ibmvnic_adapter *adapter)
>  			break;
>  		case REQUEST_ERROR_INFO:
>  			spin_lock_irqsave(&adapter->error_list_lock, flags2);
> -			list_for_each_entry(error_buff, &adapter->errors,
> -					    list) {
> +			list_for_each_entry_safe(error_buff, tmp2,
> +						 &adapter->errors, list) {
>  				dma_unmap_single(dev, error_buff->dma,
>  						 error_buff->len,
>  						 DMA_FROM_DEVICE);
>
Thanks!

Acked-by: Thomas Falcon <tlfalcon at linux.vnet.ibm.com>
>
>
>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev



More information about the Linuxppc-dev mailing list