UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

RDS: Move some variables around for consistency 

Also, add a comment.

Signed-off-by: Andy Grover <andy.grover@oracle.com>
This commit is contained in:
Andy Grover 2010-03-01 16:04:59 -08:00
parent 940786eb0a
commit 7e3bd65ebf
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/rds/rdma.c
View File

@ -747,6 +747,7 @@ int rds_cmsg_atomic(struct rds_sock *rs, struct rds_message *rm,
} }
rm->atomic.op_notify = !!(args->flags & RDS_RDMA_NOTIFY_ME); rm->atomic.op_notify = !!(args->flags & RDS_RDMA_NOTIFY_ME);
rm->atomic.op_active = 1;
rm->atomic.op_recverr = rs->rs_recverr; rm->atomic.op_recverr = rs->rs_recverr;
rm->atomic.op_sg = rds_message_alloc_sgs(rm, 1); rm->atomic.op_sg = rds_message_alloc_sgs(rm, 1);
@ -782,8 +783,6 @@ int rds_cmsg_atomic(struct rds_sock *rs, struct rds_message *rm,
rm->atomic.op_rkey = rds_rdma_cookie_key(args->cookie); rm->atomic.op_rkey = rds_rdma_cookie_key(args->cookie);
rm->atomic.op_remote_addr = args->remote_addr + rds_rdma_cookie_offset(args->cookie); rm->atomic.op_remote_addr = args->remote_addr + rds_rdma_cookie_offset(args->cookie);
rm->atomic.op_active = 1;
return ret; return ret;
err: err:
if (page) if (page)

8
net/rds/rds.h
View File

@ -301,7 +301,13 @@ struct rds_message {
*/ */
spinlock_t m_rs_lock; spinlock_t m_rs_lock;
struct rds_sock *m_rs; struct rds_sock *m_rs;
/* cookie to send to remote, in rds header */
rds_rdma_cookie_t m_rdma_cookie; rds_rdma_cookie_t m_rdma_cookie;
unsigned int m_used_sgs;
unsigned int m_total_sgs;
struct { struct {
struct rm_atomic_op { struct rm_atomic_op {
int op_type; int op_type;
@ -343,8 +349,6 @@ struct rds_message {
struct scatterlist *op_sg; struct scatterlist *op_sg;
} data; } data;
}; };
unsigned int m_used_sgs;
unsigned int m_total_sgs;
}; };
/* /*