diff options
Diffstat (limited to 'net/rds/send.c')
| -rw-r--r-- | net/rds/send.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/net/rds/send.c b/net/rds/send.c index 66dc6b045261..ad89a63c4304 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, | |||
| 970 | goto out; | 970 | goto out; |
| 971 | } | 971 | } |
| 972 | 972 | ||
| 973 | rm->data.op_sg = rds_message_alloc_sgs(rm, ceil(payload_len, PAGE_SIZE)); | 973 | /* Attach data to the rm */ |
| 974 | /* XXX fix this to not allocate memory */ | 974 | if (payload_len) { |
| 975 | ret = rds_message_copy_from_user(rm, msg->msg_iov, payload_len); | 975 | rm->data.op_sg = rds_message_alloc_sgs(rm, ceil(payload_len, PAGE_SIZE)); |
| 976 | if (ret) | 976 | ret = rds_message_copy_from_user(rm, msg->msg_iov, payload_len); |
| 977 | goto out; | 977 | if (ret) |
| 978 | goto out; | ||
| 979 | } | ||
| 980 | rm->data.op_active = 1; | ||
| 978 | 981 | ||
| 979 | rm->m_daddr = daddr; | 982 | rm->m_daddr = daddr; |
| 980 | 983 | ||