Skip to content

Commit

Permalink
RDS: make sure all sgs alloced are initialized
Browse files Browse the repository at this point in the history
rds_message_alloc_sgs() now returns correctly-initialized
sg lists, so calleds need not do this themselves.

Signed-off-by: Andy Grover <andy.grover@oracle.com>
  • Loading branch information
Andy Grover committed Sep 9, 2010
1 parent ff87e97 commit f4dd96f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion net/rds/message.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions net/rds/rdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f4dd96f

Please sign in to comment.