summaryrefslogtreecommitdiff
path: root/net/rds/message.c
diff options
context:
space:
mode:
authorAndy Grover <andy.grover@oracle.com>2010-01-28 05:04:18 +0300
committerAndy Grover <andy.grover@oracle.com>2010-09-09 05:11:59 +0400
commit6c7cc6e4694dc464ae884332f2a322973497e3cf (patch)
tree9af8e2e0874ce78f9a500e22a79f9274f5efe0fd /net/rds/message.c
parentf8b3aaf2ba8ca9e27b47f8bfdff07c8b968f2c05 (diff)
downloadlinux-6c7cc6e4694dc464ae884332f2a322973497e3cf.tar.xz
RDS: Rename data op members prefix from m_ to op_
For consistency. Signed-off-by: Andy Grover <andy.grover@oracle.com>
Diffstat (limited to 'net/rds/message.c')
-rw-r--r--net/rds/message.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/net/rds/message.c b/net/rds/message.c
index bca7eda6dde9..4bd9504ca048 100644
--- a/net/rds/message.c
+++ b/net/rds/message.c
@@ -62,12 +62,12 @@ static void rds_message_purge(struct rds_message *rm)
if (unlikely(test_bit(RDS_MSG_PAGEVEC, &rm->m_flags)))
return;
- for (i = 0; i < rm->data.m_nents; i++) {
- rdsdebug("putting data page %p\n", (void *)sg_page(&rm->data.m_sg[i]));
+ for (i = 0; i < rm->data.op_nents; i++) {
+ rdsdebug("putting data page %p\n", (void *)sg_page(&rm->data.op_sg[i]));
/* XXX will have to put_page for page refs */
- __free_page(sg_page(&rm->data.m_sg[i]));
+ __free_page(sg_page(&rm->data.op_sg[i]));
}
- rm->data.m_nents = 0;
+ rm->data.op_nents = 0;
if (rm->rdma.op_active)
rds_rdma_free_op(&rm->rdma);
@@ -261,11 +261,11 @@ struct rds_message *rds_message_map_pages(unsigned long *page_addrs, unsigned in
set_bit(RDS_MSG_PAGEVEC, &rm->m_flags);
rm->m_inc.i_hdr.h_len = cpu_to_be32(total_len);
- rm->data.m_nents = ceil(total_len, PAGE_SIZE);
- rm->data.m_sg = rds_message_alloc_sgs(rm, num_sgs);
+ rm->data.op_nents = ceil(total_len, PAGE_SIZE);
+ rm->data.op_sg = rds_message_alloc_sgs(rm, num_sgs);
- for (i = 0; i < rm->data.m_nents; ++i) {
- sg_set_page(&rm->data.m_sg[i],
+ for (i = 0; i < rm->data.op_nents; ++i) {
+ sg_set_page(&rm->data.op_sg[i],
virt_to_page(page_addrs[i]),
PAGE_SIZE, 0);
}
@@ -288,7 +288,7 @@ int rds_message_copy_from_user(struct rds_message *rm, struct iovec *first_iov,
/*
* now allocate and copy in the data payload.
*/
- sg = rm->data.m_sg;
+ sg = rm->data.op_sg;
iov = first_iov;
iov_off = 0;
sg_off = 0; /* Dear gcc, sg->page will be null from kzalloc. */
@@ -299,7 +299,7 @@ int rds_message_copy_from_user(struct rds_message *rm, struct iovec *first_iov,
GFP_HIGHUSER);
if (ret)
goto out;
- rm->data.m_nents++;
+ rm->data.op_nents++;
sg_off = 0;
}
@@ -354,7 +354,7 @@ int rds_message_inc_copy_to_user(struct rds_incoming *inc,
iov = first_iov;
iov_off = 0;
- sg = rm->data.m_sg;
+ sg = rm->data.op_sg;
vec_off = 0;
copied = 0;