hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[IB] umad: get rid of unused mr array 

Now that ib_umad uses the new MAD sending interface, it no longer
needs its own L_Key.  So just delete the array of MRs that it keeps.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Roland Dreier 2005-11-09 09:58:10 -08:00
parent 40de2e548c
commit ec914c52d6
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/infiniband/core/user_mad.c
View File

@ -116,7 +116,6 @@ struct ib_umad_file {
spinlock_t recv_lock; spinlock_t recv_lock;
wait_queue_head_t recv_wait; wait_queue_head_t recv_wait;
struct ib_mad_agent *agent[IB_UMAD_MAX_AGENTS]; struct ib_mad_agent *agent[IB_UMAD_MAX_AGENTS];
struct ib_mr *mr[IB_UMAD_MAX_AGENTS];
}; };
struct ib_umad_packet { struct ib_umad_packet {
@ -505,29 +504,16 @@ found:
goto out; goto out;
} }
file->mr[agent_id] = ib_get_dma_mr(agent->qp->pd, IB_ACCESS_LOCAL_WRITE);
if (IS_ERR(file->mr[agent_id])) {
ret = -ENOMEM;
goto err;
}
if (put_user(agent_id, if (put_user(agent_id,
(u32 __user *) (arg + offsetof(struct ib_user_mad_reg_req, id)))) { (u32 __user *) (arg + offsetof(struct ib_user_mad_reg_req, id)))) {
ret = -EFAULT; ret = -EFAULT;
goto err_mr; ib_unregister_mad_agent(agent);
goto out;
} }
file->agent[agent_id] = agent; file->agent[agent_id] = agent;
ret = 0; ret = 0;
goto out;
err_mr:
ib_dereg_mr(file->mr[agent_id]);
err:
ib_unregister_mad_agent(agent);
out: out:
up_write(&file->port->mutex); up_write(&file->port->mutex);
return ret; return ret;
@ -536,7 +522,6 @@ out:
static int ib_umad_unreg_agent(struct ib_umad_file *file, unsigned long arg) static int ib_umad_unreg_agent(struct ib_umad_file *file, unsigned long arg)
{ {
struct ib_mad_agent *agent = NULL; struct ib_mad_agent *agent = NULL;
struct ib_mr *mr = NULL;
u32 id; u32 id;
int ret = 0; int ret = 0;
@ -551,16 +536,13 @@ static int ib_umad_unreg_agent(struct ib_umad_file *file, unsigned long arg)
} }
agent = file->agent[id]; agent = file->agent[id];
mr = file->mr[id];
file->agent[id] = NULL; file->agent[id] = NULL;
out: out:
up_write(&file->port->mutex); up_write(&file->port->mutex);
if (agent) { if (agent)
ib_unregister_mad_agent(agent); ib_unregister_mad_agent(agent);
ib_dereg_mr(mr);
}
return ret; return ret;
} }
@ -629,10 +611,8 @@ static int ib_umad_close(struct inode *inode, struct file *filp)
int i; int i;
for (i = 0; i < IB_UMAD_MAX_AGENTS; ++i) for (i = 0; i < IB_UMAD_MAX_AGENTS; ++i)
if (file->agent[i]) { if (file->agent[i])
ib_unregister_mad_agent(file->agent[i]); ib_unregister_mad_agent(file->agent[i]);
ib_dereg_mr(file->mr[i]);
}
list_for_each_entry_safe(packet, tmp, &file->recv_list, list) list_for_each_entry_safe(packet, tmp, &file->recv_list, list)
kfree(packet); kfree(packet);
@ -872,7 +852,6 @@ static void ib_umad_kill_port(struct ib_umad_port *port)
for (id = 0; id < IB_UMAD_MAX_AGENTS; ++id) { for (id = 0; id < IB_UMAD_MAX_AGENTS; ++id) {
if (!file->agent[id]) if (!file->agent[id])
continue; continue;
ib_dereg_mr(file->mr[id]);
ib_unregister_mad_agent(file->agent[id]); ib_unregister_mad_agent(file->agent[id]);
file->agent[id] = NULL; file->agent[id] = NULL;
} }