[patch] IB/core: missing curly braces in ib_find_gid()

[patch] IB/core: missing curly braces in ib_find_gid()

[Dan Carpenter]

Smatch says that, based on the indenting, we should probably add curly
braces here.

Fixes: 230145ff8124 ('IB/core: Add RoCE GID table management')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 258b3f7..5d5bbae 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -807,9 +807,10 @@ int ib_find_gid(struct ib_device *device, union ib_gid *gid,
 	for (port = rdma_start_port(device); port <= rdma_end_port(device); ++port) {
 		if (rdma_cap_roce_gid_table(device, port)) {
 			if (!ib_cache_gid_find_by_port(device, gid, port,
-						       NULL, index))
+						       NULL, index)) {
 				*port_num = port;
 				return 0;
+			}
 		}
 
 		for (i = 0; i < device->port_immutable[port].gid_tbl_len; ++i) {

Re: [patch] IB/core: missing curly braces in ib_find_gid()

[ira.weiny]

On Tue, Aug 18, 2015 at 12:22:10PM +0300, Dan Carpenter wrote:
> Smatch says that, based on the indenting, we should probably add curly
> braces here.
> 
> Fixes: 230145ff8124 ('IB/core: Add RoCE GID table management')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>

Reviewed-by: Ira Weiny <ira.weiny@intel.com>

> 
> diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
> index 258b3f7..5d5bbae 100644
> --- a/drivers/infiniband/core/device.c
> +++ b/drivers/infiniband/core/device.c
> @@ -807,9 +807,10 @@ int ib_find_gid(struct ib_device *device, union ib_gid *gid,
>  	for (port = rdma_start_port(device); port <= rdma_end_port(device); ++port) {
>  		if (rdma_cap_roce_gid_table(device, port)) {
>  			if (!ib_cache_gid_find_by_port(device, gid, port,
> -						       NULL, index))
> +						       NULL, index)) {
>  				*port_num = port;
>  				return 0;
> +			}
>  		}
>  
>  		for (i = 0; i < device->port_immutable[port].gid_tbl_len; ++i) {

Re: [patch] IB/core: missing curly braces in ib_find_gid()

[Doug Ledford]

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

On 08/28/2015 09:10 PM, ira.weiny wrote:
> On Tue, Aug 18, 2015 at 12:22:10PM +0300, Dan Carpenter wrote:
>> Smatch says that, based on the indenting, we should probably add curly
>> braces here.
>>
>> Fixes: 230145ff8124 ('IB/core: Add RoCE GID table management')
>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>
> 
> Reviewed-by: Ira Weiny <ira.weiny@intel.com>

I've picked this patch up (earlier today), so I missed your reviewed-by:
tag.  Added.

-- 
Doug Ledford <dledford@redhat.com>
              GPG KeyID: 0E572FDD



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]

Re: [patch] IB/core: missing curly braces in ib_find_gid()

[Or Gerlitz]

On Fri, Aug 28, 2015 at 9:02 PM, Doug Ledford <dledford@redhat.com> wrote:
> On 08/28/2015 09:10 PM, ira.weiny wrote:
>> On Tue, Aug 18, 2015 at 12:22:10PM +0300, Dan Carpenter wrote:
>>> Smatch says that, based on the indenting, we should probably add curly
>>> braces here.
>>>
>>> Fixes: 230145ff8124 ('IB/core: Add RoCE GID table management')
>>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>>
>>
>> Reviewed-by: Ira Weiny <ira.weiny@intel.com>
>
> I've picked this patch up (earlier today), so I missed your reviewed-by:
> tag.  Added.

wait, Doug, when the offending patch goes upstream, their commit ID
will not be the one
denoted here, right? I would suggest that you either hold off with
this fix till the other patch
goes upstream in 4,3-rc1 and you have a proper ID or squash it there
now. BTW - the way
net-next is organized/managed, pre-linus-tree commit ID remain the
same also after they land there,
so in that respect and other linux-rdma maintenance related aspects we
discussed during LPC  - it
would be good if you can talk to Dave and see how he gets things going
for net-next

Or

Re: [patch] IB/core: missing curly braces in ib_find_gid()

[Doug Ledford]

[-- Attachment #1: Type: text/plain, Size: 1709 bytes --]

On 08/30/2015 12:59 AM, Or Gerlitz wrote:
> On Fri, Aug 28, 2015 at 9:02 PM, Doug Ledford <dledford@redhat.com> wrote:
>> On 08/28/2015 09:10 PM, ira.weiny wrote:
>>> On Tue, Aug 18, 2015 at 12:22:10PM +0300, Dan Carpenter wrote:
>>>> Smatch says that, based on the indenting, we should probably add curly
>>>> braces here.
>>>>
>>>> Fixes: 230145ff8124 ('IB/core: Add RoCE GID table management')
>>>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>>>
>>>
>>> Reviewed-by: Ira Weiny <ira.weiny@intel.com>
>>
>> I've picked this patch up (earlier today), so I missed your reviewed-by:
>> tag.  Added.
> 
> wait, Doug, when the offending patch goes upstream, their commit ID
> will not be the one
> denoted here, right?

Fair point...

> I would suggest that you either hold off with
> this fix till the other patch
> goes upstream in 4,3-rc1 and you have a proper ID

I have a proper ID now.  Since I've put together my final k.o/for-4.3
branch, the ID is fixed.

> or squash it there
> now.

This patch is from someone different than the patch it fixes, so it
wouldn't be right to squash it into their patch.  I fixed up the Fixes:
line instead.

> BTW - the way
> net-next is organized/managed, pre-linus-tree commit ID remain the
> same also after they land there,
> so in that respect and other linux-rdma maintenance related aspects we
> discussed during LPC  - it
> would be good if you can talk to Dave and see how he gets things going
> for net-next

I'm going to be doing things differently for 4.4.  We'll see if that
resolves the issues you are unhappy about.

-- 
Doug Ledford <dledford@redhat.com>
              GPG KeyID: 0E572FDD



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]

Re: [patch] IB/core: missing curly braces in ib_find_gid()

[Doug Ledford]

[-- Attachment #1: Type: text/plain, Size: 1053 bytes --]

On 08/18/2015 05:22 AM, Dan Carpenter wrote:
> Smatch says that, based on the indenting, we should probably add curly
> braces here.
> 
> Fixes: 230145ff8124 ('IB/core: Add RoCE GID table management')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Thanks, applied.

> diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
> index 258b3f7..5d5bbae 100644
> --- a/drivers/infiniband/core/device.c
> +++ b/drivers/infiniband/core/device.c
> @@ -807,9 +807,10 @@ int ib_find_gid(struct ib_device *device, union ib_gid *gid,
>  	for (port = rdma_start_port(device); port <= rdma_end_port(device); ++port) {
>  		if (rdma_cap_roce_gid_table(device, port)) {
>  			if (!ib_cache_gid_find_by_port(device, gid, port,
> -						       NULL, index))
> +						       NULL, index)) {
>  				*port_num = port;
>  				return 0;
> +			}
>  		}
>  
>  		for (i = 0; i < device->port_immutable[port].gid_tbl_len; ++i) {
> 


-- 
Doug Ledford <dledford@redhat.com>
              GPG KeyID: 0E572FDD



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]