IB/iser: Remove redundant is_mr indicator (7e1fd4d1) · Commits · 戴 / test

drivers/infiniband/ulp/iser/iscsi_iser.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -252,7 +252,6 @@ struct iscsi_endpoint;
		* @va: MR start address (buffer va)
		* @len: MR length
		* @mem_h: pointer to registration context (FMR/Fastreg)
		* @is_mr: indicates weather we registered the buffer
		*/
		struct iser_mem_reg {
		u32 lkey;
		@@ -260,7 +259,6 @@ struct iser_mem_reg {
		u64 va;
		u64 len;
		void *mem_h;
		int is_mr;
		};

		/**

+2 −7

Original line number	Diff line number	Diff line
		@@ -408,7 +408,6 @@ int iser_reg_rdma_mem_fmr(struct iscsi_iser_task *iser_task,
		regd_buf->reg.rkey = device->mr->rkey;
		regd_buf->reg.len = ib_sg_dma_len(ibdev, &sg[0]);
		regd_buf->reg.va = ib_sg_dma_address(ibdev, &sg[0]);
		regd_buf->reg.is_mr = 0;

		iser_dbg("PHYSICAL Mem.register: lkey: 0x%08X rkey: 0x%08X "
		"va: 0x%08lX sz: %ld]\n",
		@@ -769,15 +768,11 @@ int iser_reg_rdma_mem_fastreg(struct iscsi_iser_task *iser_task,
		regd_buf->reg.rkey = desc->pi_ctx->sig_mr->rkey;
		regd_buf->reg.va = sig_sge.addr;
		regd_buf->reg.len = sig_sge.length;
		regd_buf->reg.is_mr = 1;
		} else {
		if (desc) {
		if (desc)
		regd_buf->reg.rkey = desc->data_mr->rkey;
		regd_buf->reg.is_mr = 1;
		} else {
		else
		regd_buf->reg.rkey = device->mr->rkey;
		regd_buf->reg.is_mr = 0;
		}

		regd_buf->reg.lkey = data_sge.lkey;
		regd_buf->reg.va = data_sge.addr;

+2 −4

Original line number	Diff line number	Diff line
		@@ -1009,7 +1009,6 @@ int iser_reg_page_vec(struct ib_conn *ib_conn,
		mem_reg->rkey = mem->fmr->rkey;
		mem_reg->len = page_vec->length * SIZE_4K;
		mem_reg->va = io_addr;
		mem_reg->is_mr = 1;
		mem_reg->mem_h = (void *)mem;

		mem_reg->va += page_vec->offset;
		@@ -1036,7 +1035,7 @@ void iser_unreg_mem_fmr(struct iscsi_iser_task *iser_task,
		struct iser_mem_reg *reg = &iser_task->rdma_regd[cmd_dir].reg;
		int ret;

		if (!reg->is_mr)
		if (!reg->mem_h)
		return;

		iser_dbg("PHYSICAL Mem.Unregister mem_h %p\n",reg->mem_h);
		@@ -1056,11 +1055,10 @@ void iser_unreg_mem_fastreg(struct iscsi_iser_task *iser_task,
		struct ib_conn *ib_conn = &iser_conn->ib_conn;
		struct fast_reg_descriptor *desc = reg->mem_h;

		if (!reg->is_mr)
		if (!desc)
		return;

		reg->mem_h = NULL;
		reg->is_mr = 0;
		spin_lock_bh(&ib_conn->lock);
		list_add_tail(&desc->list, &ib_conn->fastreg.pool);
		spin_unlock_bh(&ib_conn->lock);