summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAndy Grover <andy.grover@oracle.com>2010-02-03 19:40:32 -0800
committerAndy Grover <andy.grover@oracle.com>2010-09-08 18:12:02 -0700
commit372cd7dedfd1ea93a9ae8d9c282e910dc1b76773 (patch)
tree248c672e0fd7fdb8015c51d02a0e74df8d9feef9 /net
parent5b2366bd2835919e2e6a836e837eab4a9274bd46 (diff)
downloadop-kernel-dev-372cd7dedfd1ea93a9ae8d9c282e910dc1b76773.zip
op-kernel-dev-372cd7dedfd1ea93a9ae8d9c282e910dc1b76773.tar.gz
RDS: Do not set op_active in r_m_copy_from_user().
Do not allocate sgs for data for 0-length datagrams Set data.op_active in rds_sendmsg() instead of rds_message_copy_from_user(). Signed-off-by: Andy Grover <andy.grover@oracle.com>
Diffstat (limited to 'net')
-rw-r--r--net/rds/message.c2
-rw-r--r--net/rds/send.c13
2 files changed, 8 insertions, 7 deletions
diff --git a/net/rds/message.c b/net/rds/message.c
index 4bd9504..f4c3be0 100644
--- a/net/rds/message.c
+++ b/net/rds/message.c
@@ -330,8 +330,6 @@ int rds_message_copy_from_user(struct rds_message *rm, struct iovec *first_iov,
sg++;
}
- rm->data.op_active = 1;
-
out:
return ret;
}
diff --git a/net/rds/send.c b/net/rds/send.c
index 66dc6b0..ad89a63 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -970,11 +970,14 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
goto out;
}
- rm->data.op_sg = rds_message_alloc_sgs(rm, ceil(payload_len, PAGE_SIZE));
- /* XXX fix this to not allocate memory */
- ret = rds_message_copy_from_user(rm, msg->msg_iov, payload_len);
- if (ret)
- goto out;
+ /* Attach data to the rm */
+ if (payload_len) {
+ rm->data.op_sg = rds_message_alloc_sgs(rm, ceil(payload_len, PAGE_SIZE));
+ ret = rds_message_copy_from_user(rm, msg->msg_iov, payload_len);
+ if (ret)
+ goto out;
+ }
+ rm->data.op_active = 1;
rm->m_daddr = daddr;
OpenPOWER on IntegriCloud