Browse Source

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>
Andy Grover 15 năm trước cách đây
mục cha
commit
372cd7dedf
2 tập tin đã thay đổi với 8 bổ sung7 xóa
  1. 0 2
      net/rds/message.c
  2. 8 5
      net/rds/send.c

+ 0 - 2
net/rds/message.c

@@ -330,8 +330,6 @@ int rds_message_copy_from_user(struct rds_message *rm, struct iovec *first_iov,
 			sg++;
 			sg++;
 	}
 	}
 
 
-	rm->data.op_active = 1;
-
 out:
 out:
 	return ret;
 	return ret;
 }
 }

+ 8 - 5
net/rds/send.c

@@ -970,11 +970,14 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
 		goto out;
 		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;
 	rm->m_daddr = daddr;