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

Commit 5190cc26 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Doug Ledford
Browse files

IB/iser: Rename struct fast_reg_descriptor -> iser_fr_desc 



Avoid struct names without iser_ prefix.

This patch does not change any functionality.

Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent d711d81d

drivers/infiniband/ulp/iser/iscsi_iser.h

+4 −4
Original line number Diff line number Diff line
@@ -396,13 +396,13 @@ struct iser_pi_context { 
};



/**

 * struct fast_reg_descriptor - Fast registration descriptor

 * struct iser_fr_desc - Fast registration descriptor

 *

 * @list:           entry in connection fastreg pool

 * @rsc:            data buffer registration resources

 * @pi_ctx:         protection information context

 */

struct fast_reg_descriptor {

struct iser_fr_desc {

	struct list_head		  list;

	struct iser_reg_resources	  rsc;

	struct iser_pi_context		 *pi_ctx;
@@ -642,9 +642,9 @@ int iser_create_fastreg_pool(struct ib_conn *ib_conn, unsigned cmds_max); 
void iser_free_fastreg_pool(struct ib_conn *ib_conn);

u8 iser_check_task_pi_status(struct iscsi_iser_task *iser_task,

			     enum iser_data_dir cmd_dir, sector_t *sector);

struct fast_reg_descriptor *

struct iser_fr_desc *

iser_reg_desc_get(struct ib_conn *ib_conn);

void

iser_reg_desc_put(struct ib_conn *ib_conn,

		  struct fast_reg_descriptor *desc);

		  struct iser_fr_desc *desc);

#endif

drivers/infiniband/ulp/iser/iser_memory.c

+5 −5
Original line number Diff line number Diff line
@@ -146,15 +146,15 @@ iser_copy_to_bounce(struct iser_data_buf *data) 
	iser_copy_bounce(data, true);

}



struct fast_reg_descriptor *

struct iser_fr_desc *

iser_reg_desc_get(struct ib_conn *ib_conn)

{

	struct fast_reg_descriptor *desc;

	struct iser_fr_desc *desc;

	unsigned long flags;



	spin_lock_irqsave(&ib_conn->lock, flags);

	desc = list_first_entry(&ib_conn->fastreg.pool,

				struct fast_reg_descriptor, list);

				struct iser_fr_desc, list);

	list_del(&desc->list);

	spin_unlock_irqrestore(&ib_conn->lock, flags);
@@ -163,7 +163,7 @@ iser_reg_desc_get(struct ib_conn *ib_conn) 


void

iser_reg_desc_put(struct ib_conn *ib_conn,

		  struct fast_reg_descriptor *desc)

		  struct iser_fr_desc *desc)

{

	unsigned long flags;
@@ -787,7 +787,7 @@ int iser_reg_rdma_mem_fastreg(struct iscsi_iser_task *iser_task, 
	struct ib_device *ibdev = device->ib_device;

	struct iser_data_buf *mem = &iser_task->data[cmd_dir];

	struct iser_mem_reg *mem_reg = &iser_task->rdma_reg[cmd_dir];

	struct fast_reg_descriptor *desc = NULL;

	struct iser_fr_desc *desc = NULL;

	int err, aligned_len;



	aligned_len = iser_data_buf_aligned_len(mem, ibdev);

drivers/infiniband/ulp/iser/iser_verbs.c

+5 −5
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ iser_free_reg_res(struct iser_reg_resources *rsc) 


static int

iser_alloc_pi_ctx(struct ib_device *ib_device, struct ib_pd *pd,

		  struct fast_reg_descriptor *desc)

		  struct iser_fr_desc *desc)

{

	struct iser_pi_context *pi_ctx = NULL;

	int ret;
@@ -365,7 +365,7 @@ iser_free_pi_ctx(struct iser_pi_context *pi_ctx) 


static int

iser_create_fastreg_desc(struct ib_device *ib_device, struct ib_pd *pd,

			 bool pi_enable, struct fast_reg_descriptor *desc)

			 bool pi_enable, struct iser_fr_desc *desc)

{

	int ret;
@@ -397,7 +397,7 @@ iser_create_fastreg_desc(struct ib_device *ib_device, struct ib_pd *pd, 
int iser_create_fastreg_pool(struct ib_conn *ib_conn, unsigned cmds_max)

{

	struct iser_device *device = ib_conn->device;

	struct fast_reg_descriptor *desc;

	struct iser_fr_desc *desc;

	int i, ret;



	INIT_LIST_HEAD(&ib_conn->fastreg.pool);
@@ -435,7 +435,7 @@ int iser_create_fastreg_pool(struct ib_conn *ib_conn, unsigned cmds_max) 
 */

void iser_free_fastreg_pool(struct ib_conn *ib_conn)

{

	struct fast_reg_descriptor *desc, *tmp;

	struct iser_fr_desc *desc, *tmp;

	int i = 0;



	if (list_empty(&ib_conn->fastreg.pool))
@@ -1252,7 +1252,7 @@ u8 iser_check_task_pi_status(struct iscsi_iser_task *iser_task, 
			     enum iser_data_dir cmd_dir, sector_t *sector)

{

	struct iser_mem_reg *reg = &iser_task->rdma_reg[cmd_dir];

	struct fast_reg_descriptor *desc = reg->mem_h;

	struct iser_fr_desc *desc = reg->mem_h;

	unsigned long sector_size = iser_task->sc->device->sector_size;

	struct ib_mr_status mr_status;

	int ret;