mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	RDMA/core: Cosmetic change - move member initialization to correct block
old_pd is used only if IB_MR_REREG_PD flags is set. For readability move it's initialization to where it is used. While there rewrite the whole 'if-else' block so on error jump directly to label and no need for 'else' Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com> Reviewed-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
		
							parent
							
								
									3b8f8b95d9
								
							
						
					
					
						commit
						e278173fd1
					
				
					 1 changed files with 7 additions and 8 deletions
				
			
		| 
						 | 
					@ -819,19 +819,18 @@ static int ib_uverbs_rereg_mr(struct uverbs_attr_bundle *attrs)
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	old_pd = mr->pd;
 | 
					 | 
				
			||||||
	ret = mr->device->ops.rereg_user_mr(mr, cmd.flags, cmd.start,
 | 
						ret = mr->device->ops.rereg_user_mr(mr, cmd.flags, cmd.start,
 | 
				
			||||||
					    cmd.length, cmd.hca_va,
 | 
										    cmd.length, cmd.hca_va,
 | 
				
			||||||
					    cmd.access_flags, pd,
 | 
										    cmd.access_flags, pd,
 | 
				
			||||||
					    &attrs->driver_udata);
 | 
										    &attrs->driver_udata);
 | 
				
			||||||
	if (!ret) {
 | 
						if (ret)
 | 
				
			||||||
		if (cmd.flags & IB_MR_REREG_PD) {
 | 
					 | 
				
			||||||
			atomic_inc(&pd->usecnt);
 | 
					 | 
				
			||||||
			mr->pd = pd;
 | 
					 | 
				
			||||||
			atomic_dec(&old_pd->usecnt);
 | 
					 | 
				
			||||||
		}
 | 
					 | 
				
			||||||
	} else {
 | 
					 | 
				
			||||||
		goto put_uobj_pd;
 | 
							goto put_uobj_pd;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (cmd.flags & IB_MR_REREG_PD) {
 | 
				
			||||||
 | 
							old_pd = mr->pd;
 | 
				
			||||||
 | 
							atomic_inc(&pd->usecnt);
 | 
				
			||||||
 | 
							mr->pd = pd;
 | 
				
			||||||
 | 
							atomic_dec(&old_pd->usecnt);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	memset(&resp, 0, sizeof(resp));
 | 
						memset(&resp, 0, sizeof(resp));
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue