diff options
author | Joe Perches <joe@perches.com> | 2009-11-29 19:55:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-29 19:55:45 -0500 |
commit | f64f9e719261a87818dd192a3a2352e5b20fbd0f (patch) | |
tree | b2d5cbaef3df615295f6061d8c4d6a912690556c /net/rds/rdma.c | |
parent | 152b6a62aea2d43359dd37004e9c218bf7bdeb3b (diff) |
net: Move && and || to end of previous line
Not including net/atm/
Compiled tested x86 allyesconfig only
Added a > 80 column line or two, which I ignored.
Existing checkpatch plaints willfully, cheerfully ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/rdma.c')
-rw-r--r-- | net/rds/rdma.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/rds/rdma.c b/net/rds/rdma.c index 971b5a668458..4c64daa1f5d5 100644 --- a/net/rds/rdma.c +++ b/net/rds/rdma.c | |||
@@ -631,8 +631,8 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm, | |||
631 | { | 631 | { |
632 | struct rds_rdma_op *op; | 632 | struct rds_rdma_op *op; |
633 | 633 | ||
634 | if (cmsg->cmsg_len < CMSG_LEN(sizeof(struct rds_rdma_args)) | 634 | if (cmsg->cmsg_len < CMSG_LEN(sizeof(struct rds_rdma_args)) || |
635 | || rm->m_rdma_op != NULL) | 635 | rm->m_rdma_op != NULL) |
636 | return -EINVAL; | 636 | return -EINVAL; |
637 | 637 | ||
638 | op = rds_rdma_prepare(rs, CMSG_DATA(cmsg)); | 638 | op = rds_rdma_prepare(rs, CMSG_DATA(cmsg)); |
@@ -655,8 +655,8 @@ int rds_cmsg_rdma_dest(struct rds_sock *rs, struct rds_message *rm, | |||
655 | u32 r_key; | 655 | u32 r_key; |
656 | int err = 0; | 656 | int err = 0; |
657 | 657 | ||
658 | if (cmsg->cmsg_len < CMSG_LEN(sizeof(rds_rdma_cookie_t)) | 658 | if (cmsg->cmsg_len < CMSG_LEN(sizeof(rds_rdma_cookie_t)) || |
659 | || rm->m_rdma_cookie != 0) | 659 | rm->m_rdma_cookie != 0) |
660 | return -EINVAL; | 660 | return -EINVAL; |
661 | 661 | ||
662 | memcpy(&rm->m_rdma_cookie, CMSG_DATA(cmsg), sizeof(rm->m_rdma_cookie)); | 662 | memcpy(&rm->m_rdma_cookie, CMSG_DATA(cmsg), sizeof(rm->m_rdma_cookie)); |
@@ -692,8 +692,8 @@ int rds_cmsg_rdma_dest(struct rds_sock *rs, struct rds_message *rm, | |||
692 | int rds_cmsg_rdma_map(struct rds_sock *rs, struct rds_message *rm, | 692 | int rds_cmsg_rdma_map(struct rds_sock *rs, struct rds_message *rm, |
693 | struct cmsghdr *cmsg) | 693 | struct cmsghdr *cmsg) |
694 | { | 694 | { |
695 | if (cmsg->cmsg_len < CMSG_LEN(sizeof(struct rds_get_mr_args)) | 695 | if (cmsg->cmsg_len < CMSG_LEN(sizeof(struct rds_get_mr_args)) || |
696 | || rm->m_rdma_cookie != 0) | 696 | rm->m_rdma_cookie != 0) |
697 | return -EINVAL; | 697 | return -EINVAL; |
698 | 698 | ||
699 | return __rds_rdma_map(rs, CMSG_DATA(cmsg), &rm->m_rdma_cookie, &rm->m_rdma_mr); | 699 | return __rds_rdma_map(rs, CMSG_DATA(cmsg), &rm->m_rdma_cookie, &rm->m_rdma_mr); |