Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dff9936 authored by Avinash Repaka's avatar Avinash Repaka Committed by David S. Miller
Browse files

RDS: IB: Limit the scope of has_fr/has_fmr variables 



This patch fixes the scope of has_fr and has_fmr variables as they are
needed only in rds_ib_add_one().

Signed-off-by: default avatarAvinash Repaka <avinash.repaka@oracle.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1bcdca3f

net/rds/ib.c

+6 −5
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ void rds_ib_dev_put(struct rds_ib_device *rds_ibdev) 
static void rds_ib_add_one(struct ib_device *device)

{

	struct rds_ib_device *rds_ibdev;

	bool has_fr, has_fmr;



	/* Only handle IB (no iWARP) devices */

	if (device->node_type != RDMA_NODE_IB_CA)
@@ -143,11 +144,11 @@ static void rds_ib_add_one(struct ib_device *device) 
	rds_ibdev->max_wrs = device->attrs.max_qp_wr;

	rds_ibdev->max_sge = min(device->attrs.max_sge, RDS_IB_MAX_SGE);



	rds_ibdev->has_fr = (device->attrs.device_cap_flags &

	has_fr = (device->attrs.device_cap_flags &

		  IB_DEVICE_MEM_MGT_EXTENSIONS);

	rds_ibdev->has_fmr = (device->alloc_fmr && device->dealloc_fmr &&

	has_fmr = (device->alloc_fmr && device->dealloc_fmr &&

		   device->map_phys_fmr && device->unmap_fmr);

	rds_ibdev->use_fastreg = (rds_ibdev->has_fr && !rds_ibdev->has_fmr);

	rds_ibdev->use_fastreg = (has_fr && !has_fmr);



	rds_ibdev->fmr_max_remaps = device->attrs.max_map_per_fmr?: 32;

	rds_ibdev->max_1m_mrs = device->attrs.max_mr ?

net/rds/ib.h

+0 −2
Original line number Diff line number Diff line
@@ -215,8 +215,6 @@ struct rds_ib_device { 
	struct list_head	conn_list;

	struct ib_device	*dev;

	struct ib_pd		*pd;

	bool                    has_fmr;

	bool                    has_fr;

	bool                    use_fastreg;



	unsigned int		max_mrs;