From a254b13cc31b16ef5105e8c2c541cf355c7b3e9c Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Tue, 12 Jan 2010 14:17:31 -0800 Subject: [PATCH] --- yaml --- r: 214379 b: refs/heads/master c: f4dd96f7b27743e568cec519eff0f951c56833c6 h: refs/heads/master i: 214377: ab3b13477d6b773e81cb4f0f1d97272bae7b14f0 214375: 71a2170d06aef37c00166743dde3e20f312211fe v: v3 --- [refs] | 2 +- trunk/net/rds/message.c | 2 +- trunk/net/rds/rdma.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3e047cff8123..7940d59dd679 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff87e97a9d70c9ae133d3d3d7792b26ab85f4297 +refs/heads/master: f4dd96f7b27743e568cec519eff0f951c56833c6 diff --git a/trunk/net/rds/message.c b/trunk/net/rds/message.c index 4352ce79b376..7d678e217820 100644 --- a/trunk/net/rds/message.c +++ b/trunk/net/rds/message.c @@ -249,7 +249,7 @@ struct scatterlist *rds_message_alloc_sgs(struct rds_message *rm, int nents) WARN_ON(rm->m_used_sgs + nents > rm->m_total_sgs); sg_ret = &sg_first[rm->m_used_sgs]; - + sg_init_table(sg_ret, nents); rm->m_used_sgs += nents; return sg_ret; diff --git a/trunk/net/rds/rdma.c b/trunk/net/rds/rdma.c index 7ff3379bab14..4fda33045598 100644 --- a/trunk/net/rds/rdma.c +++ b/trunk/net/rds/rdma.c @@ -534,14 +534,13 @@ static int rds_rdma_prepare(struct rds_message *rm, goto out; } - op->r_sg = rds_message_alloc_sgs(rm, nr_pages); op->r_write = !!(args->flags & RDS_RDMA_READWRITE); op->r_fence = !!(args->flags & RDS_RDMA_FENCE); op->r_notify = !!(args->flags & RDS_RDMA_NOTIFY_ME); op->r_active = 1; op->r_recverr = rs->rs_recverr; WARN_ON(!nr_pages); - sg_init_table(op->r_sg, nr_pages); + op->r_sg = rds_message_alloc_sgs(rm, nr_pages); if (op->r_notify || op->r_recverr) { /* We allocate an uninitialized notifier here, because