[rds-devel] [PATCH 3/3] RDS/iWARP: Change RDS/IB to RDS/IW in log messages.
Steve Wise
swise at opengridcomputing.com
Mon Jan 26 12:14:01 PST 2009
From: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
---
drivers/infiniband/ulp/rds/iw.h | 2 +-
drivers/infiniband/ulp/rds/iw_cm.c | 10 +++++-----
drivers/infiniband/ulp/rds/iw_rdma.c | 16 ++++++++--------
drivers/infiniband/ulp/rds/iw_send.c | 10 +++++-----
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/infiniband/ulp/rds/iw.h b/drivers/infiniband/ulp/rds/iw.h
index 6e7b8f4..a5fcfc4 100644
--- a/drivers/infiniband/ulp/rds/iw.h
+++ b/drivers/infiniband/ulp/rds/iw.h
@@ -289,7 +289,7 @@ void rds_iw_listen_stop(void);
void __rds_iw_conn_error(struct rds_connection *conn, const char *, ...);
#define rds_iw_conn_error(conn, fmt...) \
- __rds_iw_conn_error(conn, KERN_WARNING "RDS/IB: " fmt)
+ __rds_iw_conn_error(conn, KERN_WARNING "RDS/IW: " fmt)
/* ib_rdma.c */
int rds_iw_update_cm_id(struct rds_iw_device *rds_ibdev, struct rdma_cm_id *cm_id);
diff --git a/drivers/infiniband/ulp/rds/iw_cm.c b/drivers/infiniband/ulp/rds/iw_cm.c
index f9da16c..f3940da 100644
--- a/drivers/infiniband/ulp/rds/iw_cm.c
+++ b/drivers/infiniband/ulp/rds/iw_cm.c
@@ -122,7 +122,7 @@ static void rds_iw_connect_complete(struct rds_connection *conn, struct rdma_cm_
rds_iw_set_flow_control(conn, be32_to_cpu(dp->dp_credit));
}
- printk(KERN_NOTICE "RDS/IB: connected to %u.%u.%u.%u version %u.%u%s\n",
+ printk(KERN_NOTICE "RDS/IW: connected to %u.%u.%u.%u version %u.%u%s\n",
NIPQUAD(conn->c_laddr),
RDS_PROTOCOL_MAJOR(conn->c_version),
RDS_PROTOCOL_MINOR(conn->c_version),
@@ -313,7 +313,7 @@ static int rds_iw_setup_qp(struct rds_connection *conn)
rds_ibdev = ib_get_client_data(dev, &rds_iw_client);
if (rds_ibdev == NULL) {
if (printk_ratelimit())
- printk(KERN_NOTICE "RDS/IB: No client_data for device %s\n",
+ printk(KERN_NOTICE "RDS/IW: No client_data for device %s\n",
dev->name);
return -EOPNOTSUPP;
}
@@ -891,7 +891,7 @@ int __init rds_iw_listen_init(void)
cm_id = rdma_create_id(rds_iw_cm_event_handler, NULL, RDMA_PS_TCP);
if (IS_ERR(cm_id)) {
ret = PTR_ERR(cm_id);
- printk(KERN_ERR "RDS/IB: failed to setup listener, "
+ printk(KERN_ERR "RDS/IW: failed to setup listener, "
"rdma_create_id() returned %d\n", ret);
goto out;
}
@@ -906,14 +906,14 @@ int __init rds_iw_listen_init(void)
*/
ret = rdma_bind_addr(cm_id, (struct sockaddr *)&sin);
if (ret) {
- printk(KERN_ERR "RDS/IB: failed to setup listener, "
+ printk(KERN_ERR "RDS/IW: failed to setup listener, "
"rdma_bind_addr() returned %d\n", ret);
goto out;
}
ret = rdma_listen(cm_id, 128);
if (ret) {
- printk(KERN_ERR "RDS/IB: failed to setup listener, "
+ printk(KERN_ERR "RDS/IW: failed to setup listener, "
"rdma_listen() returned %d\n", ret);
goto out;
}
diff --git a/drivers/infiniband/ulp/rds/iw_rdma.c b/drivers/infiniband/ulp/rds/iw_rdma.c
index 6381276..f830124 100644
--- a/drivers/infiniband/ulp/rds/iw_rdma.c
+++ b/drivers/infiniband/ulp/rds/iw_rdma.c
@@ -277,7 +277,7 @@ static u64 *rds_iw_map_scatterlist(struct rds_iw_device *rds_ibdev,
sg->dma_len = ib_dma_map_sg(dev, sg->list, sg->len, DMA_BIDIRECTIONAL);
if (unlikely(!sg->dma_len)) {
- printk(KERN_WARNING "RDS/IB: dma_map_sg failed!\n");
+ printk(KERN_WARNING "RDS/IW: dma_map_sg failed!\n");
return ERR_PTR(-EBUSY);
}
@@ -345,7 +345,7 @@ struct rds_iw_mr_pool *rds_iw_create_mr_pool(struct rds_iw_device *rds_ibdev)
pool = kzalloc(sizeof(*pool), GFP_KERNEL);
if (!pool) {
- printk(KERN_WARNING "RDS/IB: rds_iw_create_mr_pool alloc error\n");
+ printk(KERN_WARNING "RDS/IW: rds_iw_create_mr_pool alloc error\n");
return ERR_PTR(-ENOMEM);
}
@@ -571,7 +571,7 @@ void rds_iw_free_mr(void *trans_private, int invalidate)
struct rds_iw_mr *ibmr = trans_private;
struct rds_iw_mr_pool *pool = ibmr->device->mr_pool;
- rdsdebug("RDS/IB: free_mr nents %u\n", ibmr->mapping.m_sg.len);
+ rdsdebug("RDS/IW: free_mr nents %u\n", ibmr->mapping.m_sg.len);
if (!pool)
return;
@@ -636,7 +636,7 @@ void *rds_iw_get_mr(struct scatterlist *sg, unsigned long nents,
if (ret == 0)
*key_ret = ibmr->mr->rkey;
else
- printk(KERN_WARNING "RDS/IB: failed to map mr (errno=%d)\n", ret);
+ printk(KERN_WARNING "RDS/IW: failed to map mr (errno=%d)\n", ret);
out:
if (ret) {
@@ -681,7 +681,7 @@ static int rds_iw_init_fastreg(struct rds_iw_mr_pool *pool,
if (IS_ERR(mr)) {
err = PTR_ERR(mr);
- printk(KERN_WARNING "RDS/IB: ib_alloc_fast_reg_mr failed (err=%d)\n", err);
+ printk(KERN_WARNING "RDS/IW: ib_alloc_fast_reg_mr failed (err=%d)\n", err);
return err;
}
@@ -692,7 +692,7 @@ static int rds_iw_init_fastreg(struct rds_iw_mr_pool *pool,
if (IS_ERR(page_list)) {
err = PTR_ERR(page_list);
- printk(KERN_WARNING "RDS/IB: ib_alloc_fast_reg_page_list failed (err=%d)\n", err);
+ printk(KERN_WARNING "RDS/IW: ib_alloc_fast_reg_page_list failed (err=%d)\n", err);
ib_dereg_mr(mr);
return err;
}
@@ -735,7 +735,7 @@ static int rds_iw_rdma_build_fastreg(struct rds_iw_mapping *mapping)
ret = ib_post_send(ibmr->cm_id->qp, &f_wr, &failed_wr);
BUG_ON(failed_wr != &f_wr);
if (ret) {
- printk(KERN_WARNING "RDS/IB: %s %d ib_post_send returned %d\n",
+ printk(KERN_WARNING "RDS/IW: %s %d ib_post_send returned %d\n",
__func__, __LINE__, ret);
goto out;
}
@@ -761,7 +761,7 @@ static int rds_iw_rdma_fastreg_inv(struct rds_iw_mr *ibmr)
failed_wr = &s_wr;
ret = ib_post_send(ibmr->cm_id->qp, &s_wr, &failed_wr);
if (ret) {
- printk(KERN_WARNING "RDS/IB: %s %d ib_post_send returned %d\n",
+ printk(KERN_WARNING "RDS/IW: %s %d ib_post_send returned %d\n",
__func__, __LINE__, ret);
goto out;
}
diff --git a/drivers/infiniband/ulp/rds/iw_send.c b/drivers/infiniband/ulp/rds/iw_send.c
index f6d1cba..fd57c68 100644
--- a/drivers/infiniband/ulp/rds/iw_send.c
+++ b/drivers/infiniband/ulp/rds/iw_send.c
@@ -156,13 +156,13 @@ void rds_iw_send_init_ring(struct rds_iw_connection *ic)
if (ic->i_iwarp) {
send->s_mr = ib_alloc_fast_reg_mr(ic->i_pd, fastreg_message_size);
if (IS_ERR(send->s_mr)) {
- printk(KERN_WARNING "RDS/IB: ib_alloc_fast_reg_mr failed\n");
+ printk(KERN_WARNING "RDS/IW: ib_alloc_fast_reg_mr failed\n");
break;
}
send->s_page_list = ib_alloc_fast_reg_page_list(ic->i_cm_id->device, fastreg_message_size);
if (IS_ERR(send->s_page_list)) {
- printk(KERN_WARNING "RDS/IB: ib_alloc_fast_reg_page_list failed\n");
+ printk(KERN_WARNING "RDS/IW: ib_alloc_fast_reg_page_list failed\n");
break;
}
} else {
@@ -265,7 +265,7 @@ void rds_iw_send_cq_comp_handler(struct ib_cq *cq, void *context)
default:
if (printk_ratelimit())
printk(KERN_NOTICE
- "RDS/IB: %s: unexpected opcode 0x%x in WR!\n",
+ "RDS/IW: %s: unexpected opcode 0x%x in WR!\n",
__func__, send->s_wr.opcode);
break;
}
@@ -732,7 +732,7 @@ add_header:
first, &first->s_wr, ret, failed_wr);
BUG_ON(failed_wr != &first->s_wr);
if (ret) {
- printk(KERN_WARNING "RDS/IB: ib_post_send to %u.%u.%u.%u "
+ printk(KERN_WARNING "RDS/IW: ib_post_send to %u.%u.%u.%u "
"returned %d\n", NIPQUAD(conn->c_faddr), ret);
rds_iw_ring_unalloc(&ic->i_send_ring, work_alloc);
if (prev->s_rm) {
@@ -938,7 +938,7 @@ int rds_iw_xmit_rdma(struct rds_connection *conn, struct rds_rdma_op *op)
first, &first->s_wr, ret, failed_wr);
BUG_ON(failed_wr != &first->s_wr);
if (ret) {
- printk(KERN_WARNING "RDS/IB: rdma ib_post_send to %u.%u.%u.%u "
+ printk(KERN_WARNING "RDS/IW: rdma ib_post_send to %u.%u.%u.%u "
"returned %d\n", NIPQUAD(conn->c_faddr), ret);
rds_iw_ring_unalloc(&ic->i_send_ring, work_alloc);
goto out;
More information about the rds-devel
mailing list