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

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
...@@ -396,13 +396,13 @@ struct iser_pi_context { ...@@ -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 * @list: entry in connection fastreg pool
* @rsc: data buffer registration resources * @rsc: data buffer registration resources
* @pi_ctx: protection information context * @pi_ctx: protection information context
*/ */
struct fast_reg_descriptor { struct iser_fr_desc {
struct list_head list; struct list_head list;
struct iser_reg_resources rsc; struct iser_reg_resources rsc;
struct iser_pi_context *pi_ctx; struct iser_pi_context *pi_ctx;
...@@ -642,9 +642,9 @@ int iser_create_fastreg_pool(struct ib_conn *ib_conn, unsigned cmds_max); ...@@ -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); void iser_free_fastreg_pool(struct ib_conn *ib_conn);
u8 iser_check_task_pi_status(struct iscsi_iser_task *iser_task, u8 iser_check_task_pi_status(struct iscsi_iser_task *iser_task,
enum iser_data_dir cmd_dir, sector_t *sector); 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); iser_reg_desc_get(struct ib_conn *ib_conn);
void void
iser_reg_desc_put(struct ib_conn *ib_conn, iser_reg_desc_put(struct ib_conn *ib_conn,
struct fast_reg_descriptor *desc); struct iser_fr_desc *desc);
#endif #endif
...@@ -146,15 +146,15 @@ iser_copy_to_bounce(struct iser_data_buf *data) ...@@ -146,15 +146,15 @@ iser_copy_to_bounce(struct iser_data_buf *data)
iser_copy_bounce(data, true); iser_copy_bounce(data, true);
} }
struct fast_reg_descriptor * struct iser_fr_desc *
iser_reg_desc_get(struct ib_conn *ib_conn) iser_reg_desc_get(struct ib_conn *ib_conn)
{ {
struct fast_reg_descriptor *desc; struct iser_fr_desc *desc;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ib_conn->lock, flags); spin_lock_irqsave(&ib_conn->lock, flags);
desc = list_first_entry(&ib_conn->fastreg.pool, desc = list_first_entry(&ib_conn->fastreg.pool,
struct fast_reg_descriptor, list); struct iser_fr_desc, list);
list_del(&desc->list); list_del(&desc->list);
spin_unlock_irqrestore(&ib_conn->lock, flags); spin_unlock_irqrestore(&ib_conn->lock, flags);
...@@ -163,7 +163,7 @@ iser_reg_desc_get(struct ib_conn *ib_conn) ...@@ -163,7 +163,7 @@ iser_reg_desc_get(struct ib_conn *ib_conn)
void void
iser_reg_desc_put(struct ib_conn *ib_conn, iser_reg_desc_put(struct ib_conn *ib_conn,
struct fast_reg_descriptor *desc) struct iser_fr_desc *desc)
{ {
unsigned long flags; unsigned long flags;
...@@ -787,7 +787,7 @@ int iser_reg_rdma_mem_fastreg(struct iscsi_iser_task *iser_task, ...@@ -787,7 +787,7 @@ int iser_reg_rdma_mem_fastreg(struct iscsi_iser_task *iser_task,
struct ib_device *ibdev = device->ib_device; struct ib_device *ibdev = device->ib_device;
struct iser_data_buf *mem = &iser_task->data[cmd_dir]; struct iser_data_buf *mem = &iser_task->data[cmd_dir];
struct iser_mem_reg *mem_reg = &iser_task->rdma_reg[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; int err, aligned_len;
aligned_len = iser_data_buf_aligned_len(mem, ibdev); aligned_len = iser_data_buf_aligned_len(mem, ibdev);
......
...@@ -320,7 +320,7 @@ iser_free_reg_res(struct iser_reg_resources *rsc) ...@@ -320,7 +320,7 @@ iser_free_reg_res(struct iser_reg_resources *rsc)
static int static int
iser_alloc_pi_ctx(struct ib_device *ib_device, struct ib_pd *pd, 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; struct iser_pi_context *pi_ctx = NULL;
int ret; int ret;
...@@ -365,7 +365,7 @@ iser_free_pi_ctx(struct iser_pi_context *pi_ctx) ...@@ -365,7 +365,7 @@ iser_free_pi_ctx(struct iser_pi_context *pi_ctx)
static int static int
iser_create_fastreg_desc(struct ib_device *ib_device, struct ib_pd *pd, 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; int ret;
...@@ -397,7 +397,7 @@ iser_create_fastreg_desc(struct ib_device *ib_device, struct ib_pd *pd, ...@@ -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) int iser_create_fastreg_pool(struct ib_conn *ib_conn, unsigned cmds_max)
{ {
struct iser_device *device = ib_conn->device; struct iser_device *device = ib_conn->device;
struct fast_reg_descriptor *desc; struct iser_fr_desc *desc;
int i, ret; int i, ret;
INIT_LIST_HEAD(&ib_conn->fastreg.pool); INIT_LIST_HEAD(&ib_conn->fastreg.pool);
...@@ -435,7 +435,7 @@ int iser_create_fastreg_pool(struct ib_conn *ib_conn, unsigned cmds_max) ...@@ -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) 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; int i = 0;
if (list_empty(&ib_conn->fastreg.pool)) if (list_empty(&ib_conn->fastreg.pool))
...@@ -1252,7 +1252,7 @@ u8 iser_check_task_pi_status(struct iscsi_iser_task *iser_task, ...@@ -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) enum iser_data_dir cmd_dir, sector_t *sector)
{ {
struct iser_mem_reg *reg = &iser_task->rdma_reg[cmd_dir]; 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; unsigned long sector_size = iser_task->sc->device->sector_size;
struct ib_mr_status mr_status; struct ib_mr_status mr_status;
int ret; int ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment