RDS: Explicitly allocate rm in sendmsg()

[net-next-2.6.git] / net / rds / rds.h

diff --git a/net/rds/rds.h b/net/rds/rds.h
index 07a750b3fb312879b8b73d2f65ca64e8ebe4d491..d29c71aabbd4ac08216217b3165e38b2a99b5fee 100644 (file)
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -268,9 +268,11 @@ struct rds_message {
                struct {
                        unsigned int            m_nents;
                        unsigned int            m_count;
-                       struct scatterlist      m_sg[0];
+                       struct scatterlist      *m_sg;
                } data;
        };
+       unsigned int            m_used_sgs;
+       unsigned int            m_total_sgs;
 };
 
 /*
@@ -573,7 +575,8 @@ rds_conn_connecting(struct rds_connection *conn)
 
 /* message.c */
 struct rds_message *rds_message_alloc(unsigned int nents, gfp_t gfp);
-struct rds_message *rds_message_copy_from_user(struct iovec *first_iov,
+struct scatterlist *rds_message_alloc_sgs(struct rds_message *rm, int nents);
+int rds_message_copy_from_user(struct rds_message *rm, struct iovec *first_iov,
                                               size_t total_len);
 struct rds_message *rds_message_map_pages(unsigned long *page_addrs, unsigned int total_len);
 void rds_message_populate_header(struct rds_header *hdr, __be16 sport,