[openib-general] [PATCH 1/2] Optimize cma_bind_loopback to check for empty list.

[Sean Hefty]

Acked-by: Sean Hefty <sean.hefty at intel.com>

Roland, can we queue these two patches for 2.6.20?

> Optimize to test for an empty list. Patch made against 2.6.19-rc1 tree.
> 
> Signed-off-by: Krishna Kumar <krkumar2 at in.ibm.com>
> --------
> diff -ruNp org/drivers/infiniband/core/cma.c new/drivers/infiniband/core/cma.c
> --- org/drivers/infiniband/core/cma.c	2006-10-09 16:40:04.000000000 +0530
> +++ new/drivers/infiniband/core/cma.c	2006-10-09 16:52:03.000000000 +0530
> @@ -1480,19 +1480,18 @@ static int cma_bind_loopback(struct rdma
>  	u8 p;
>  
>  	mutex_lock(&lock);
> +	if (list_empty(&dev_list)) {
> +		ret = -ENODEV;
> +		goto out;
> +	}
>  	list_for_each_entry(cma_dev, &dev_list, list)
>  		for (p = 1; p <= cma_dev->device->phys_port_cnt; ++p)
> -			if (!ib_query_port (cma_dev->device, p, &port_attr) &&
> +			if (!ib_query_port(cma_dev->device, p, &port_attr) &&
>  			    port_attr.state == IB_PORT_ACTIVE)
>  				goto port_found;
>  
> -	if (!list_empty(&dev_list)) {
> -		p = 1;
> -		cma_dev = list_entry(dev_list.next, struct cma_device, list);
> -	} else {
> -		ret = -ENODEV;
> -		goto out;
> -	}
> +	p = 1;
> +	cma_dev = list_entry(dev_list.next, struct cma_device, list);
>  
>  port_found:
>  	ret = ib_get_cached_gid(cma_dev->device, p, 0, &gid);