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/sunrpc | |
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/sunrpc')
-rw-r--r-- | net/sunrpc/auth.c | 6 | ||||
-rw-r--r-- | net/sunrpc/auth_gss/gss_krb5_seqnum.c | 4 | ||||
-rw-r--r-- | net/sunrpc/auth_gss/svcauth_gss.c | 4 | ||||
-rw-r--r-- | net/sunrpc/cache.c | 5 | ||||
-rw-r--r-- | net/sunrpc/svc.c | 5 | ||||
-rw-r--r-- | net/sunrpc/svc_xprt.c | 8 | ||||
-rw-r--r-- | net/sunrpc/svcauth.c | 4 | ||||
-rw-r--r-- | net/sunrpc/svcauth_unix.c | 4 | ||||
-rw-r--r-- | net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 7 | ||||
-rw-r--r-- | net/sunrpc/xprtrdma/verbs.c | 4 |
10 files changed, 25 insertions, 26 deletions
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index 54a4e042f104..7535a7bed2fa 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c | |||
@@ -332,9 +332,9 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred, | |||
332 | list_add_tail(&new->cr_lru, &free); | 332 | list_add_tail(&new->cr_lru, &free); |
333 | spin_unlock(&cache->lock); | 333 | spin_unlock(&cache->lock); |
334 | found: | 334 | found: |
335 | if (test_bit(RPCAUTH_CRED_NEW, &cred->cr_flags) | 335 | if (test_bit(RPCAUTH_CRED_NEW, &cred->cr_flags) && |
336 | && cred->cr_ops->cr_init != NULL | 336 | cred->cr_ops->cr_init != NULL && |
337 | && !(flags & RPCAUTH_LOOKUP_NEW)) { | 337 | !(flags & RPCAUTH_LOOKUP_NEW)) { |
338 | int res = cred->cr_ops->cr_init(auth, cred); | 338 | int res = cred->cr_ops->cr_init(auth, cred); |
339 | if (res < 0) { | 339 | if (res < 0) { |
340 | put_rpccred(cred); | 340 | put_rpccred(cred); |
diff --git a/net/sunrpc/auth_gss/gss_krb5_seqnum.c b/net/sunrpc/auth_gss/gss_krb5_seqnum.c index f160be6c1a46..17562b4c35f6 100644 --- a/net/sunrpc/auth_gss/gss_krb5_seqnum.c +++ b/net/sunrpc/auth_gss/gss_krb5_seqnum.c | |||
@@ -75,8 +75,8 @@ krb5_get_seq_num(struct crypto_blkcipher *key, | |||
75 | if ((code = krb5_decrypt(key, cksum, buf, plain, 8))) | 75 | if ((code = krb5_decrypt(key, cksum, buf, plain, 8))) |
76 | return code; | 76 | return code; |
77 | 77 | ||
78 | if ((plain[4] != plain[5]) || (plain[4] != plain[6]) | 78 | if ((plain[4] != plain[5]) || (plain[4] != plain[6]) || |
79 | || (plain[4] != plain[7])) | 79 | (plain[4] != plain[7])) |
80 | return (s32)KG_BAD_SEQ; | 80 | return (s32)KG_BAD_SEQ; |
81 | 81 | ||
82 | *direction = plain[4]; | 82 | *direction = plain[4]; |
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index f6c51e562a02..e34bc531fcb9 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c | |||
@@ -105,8 +105,8 @@ static int rsi_match(struct cache_head *a, struct cache_head *b) | |||
105 | { | 105 | { |
106 | struct rsi *item = container_of(a, struct rsi, h); | 106 | struct rsi *item = container_of(a, struct rsi, h); |
107 | struct rsi *tmp = container_of(b, struct rsi, h); | 107 | struct rsi *tmp = container_of(b, struct rsi, h); |
108 | return netobj_equal(&item->in_handle, &tmp->in_handle) | 108 | return netobj_equal(&item->in_handle, &tmp->in_handle) && |
109 | && netobj_equal(&item->in_token, &tmp->in_token); | 109 | netobj_equal(&item->in_token, &tmp->in_token); |
110 | } | 110 | } |
111 | 111 | ||
112 | static int dup_to_netobj(struct xdr_netobj *dst, char *src, int len) | 112 | static int dup_to_netobj(struct xdr_netobj *dst, char *src, int len) |
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index d6eee291a0e2..39bddba53ba1 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c | |||
@@ -401,9 +401,8 @@ static int cache_clean(void) | |||
401 | for (; ch; cp= & ch->next, ch= *cp) { | 401 | for (; ch; cp= & ch->next, ch= *cp) { |
402 | if (current_detail->nextcheck > ch->expiry_time) | 402 | if (current_detail->nextcheck > ch->expiry_time) |
403 | current_detail->nextcheck = ch->expiry_time+1; | 403 | current_detail->nextcheck = ch->expiry_time+1; |
404 | if (ch->expiry_time >= get_seconds() | 404 | if (ch->expiry_time >= get_seconds() && |
405 | && ch->last_refresh >= current_detail->flush_time | 405 | ch->last_refresh >= current_detail->flush_time) |
406 | ) | ||
407 | continue; | 406 | continue; |
408 | if (test_and_clear_bit(CACHE_PENDING, &ch->flags)) | 407 | if (test_and_clear_bit(CACHE_PENDING, &ch->flags)) |
409 | cache_dequeue(current_detail, ch); | 408 | cache_dequeue(current_detail, ch); |
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 952f206ff307..538ca433a56c 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c | |||
@@ -1103,8 +1103,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) | |||
1103 | procp->pc_release(rqstp, NULL, rqstp->rq_resp); | 1103 | procp->pc_release(rqstp, NULL, rqstp->rq_resp); |
1104 | goto dropit; | 1104 | goto dropit; |
1105 | } | 1105 | } |
1106 | if (*statp == rpc_success && (xdr = procp->pc_encode) | 1106 | if (*statp == rpc_success && |
1107 | && !xdr(rqstp, resv->iov_base+resv->iov_len, rqstp->rq_resp)) { | 1107 | (xdr = procp->pc_encode) && |
1108 | !xdr(rqstp, resv->iov_base+resv->iov_len, rqstp->rq_resp)) { | ||
1108 | dprintk("svc: failed to encode reply\n"); | 1109 | dprintk("svc: failed to encode reply\n"); |
1109 | /* serv->sv_stats->rpcsystemerr++; */ | 1110 | /* serv->sv_stats->rpcsystemerr++; */ |
1110 | *statp = rpc_system_err; | 1111 | *statp = rpc_system_err; |
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index df124f78ee48..b845e2293dfe 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c | |||
@@ -129,8 +129,8 @@ static void svc_xprt_free(struct kref *kref) | |||
129 | struct svc_xprt *xprt = | 129 | struct svc_xprt *xprt = |
130 | container_of(kref, struct svc_xprt, xpt_ref); | 130 | container_of(kref, struct svc_xprt, xpt_ref); |
131 | struct module *owner = xprt->xpt_class->xcl_owner; | 131 | struct module *owner = xprt->xpt_class->xcl_owner; |
132 | if (test_bit(XPT_CACHE_AUTH, &xprt->xpt_flags) | 132 | if (test_bit(XPT_CACHE_AUTH, &xprt->xpt_flags) && |
133 | && xprt->xpt_auth_cache != NULL) | 133 | xprt->xpt_auth_cache != NULL) |
134 | svcauth_unix_info_release(xprt->xpt_auth_cache); | 134 | svcauth_unix_info_release(xprt->xpt_auth_cache); |
135 | xprt->xpt_ops->xpo_free(xprt); | 135 | xprt->xpt_ops->xpo_free(xprt); |
136 | module_put(owner); | 136 | module_put(owner); |
@@ -846,8 +846,8 @@ static void svc_age_temp_xprts(unsigned long closure) | |||
846 | * through, close it. */ | 846 | * through, close it. */ |
847 | if (!test_and_set_bit(XPT_OLD, &xprt->xpt_flags)) | 847 | if (!test_and_set_bit(XPT_OLD, &xprt->xpt_flags)) |
848 | continue; | 848 | continue; |
849 | if (atomic_read(&xprt->xpt_ref.refcount) > 1 | 849 | if (atomic_read(&xprt->xpt_ref.refcount) > 1 || |
850 | || test_bit(XPT_BUSY, &xprt->xpt_flags)) | 850 | test_bit(XPT_BUSY, &xprt->xpt_flags)) |
851 | continue; | 851 | continue; |
852 | svc_xprt_get(xprt); | 852 | svc_xprt_get(xprt); |
853 | list_move(le, &to_be_aged); | 853 | list_move(le, &to_be_aged); |
diff --git a/net/sunrpc/svcauth.c b/net/sunrpc/svcauth.c index e64109b02aee..4e9393c24687 100644 --- a/net/sunrpc/svcauth.c +++ b/net/sunrpc/svcauth.c | |||
@@ -46,8 +46,8 @@ svc_authenticate(struct svc_rqst *rqstp, __be32 *authp) | |||
46 | dprintk("svc: svc_authenticate (%d)\n", flavor); | 46 | dprintk("svc: svc_authenticate (%d)\n", flavor); |
47 | 47 | ||
48 | spin_lock(&authtab_lock); | 48 | spin_lock(&authtab_lock); |
49 | if (flavor >= RPC_AUTH_MAXFLAVOR || !(aops = authtab[flavor]) | 49 | if (flavor >= RPC_AUTH_MAXFLAVOR || !(aops = authtab[flavor]) || |
50 | || !try_module_get(aops->owner)) { | 50 | !try_module_get(aops->owner)) { |
51 | spin_unlock(&authtab_lock); | 51 | spin_unlock(&authtab_lock); |
52 | *authp = rpc_autherr_badcred; | 52 | *authp = rpc_autherr_badcred; |
53 | return SVC_DENIED; | 53 | return SVC_DENIED; |
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c index f4c7ff3a53e6..4a8f6558718a 100644 --- a/net/sunrpc/svcauth_unix.c +++ b/net/sunrpc/svcauth_unix.c | |||
@@ -125,8 +125,8 @@ static int ip_map_match(struct cache_head *corig, struct cache_head *cnew) | |||
125 | { | 125 | { |
126 | struct ip_map *orig = container_of(corig, struct ip_map, h); | 126 | struct ip_map *orig = container_of(corig, struct ip_map, h); |
127 | struct ip_map *new = container_of(cnew, struct ip_map, h); | 127 | struct ip_map *new = container_of(cnew, struct ip_map, h); |
128 | return strcmp(orig->m_class, new->m_class) == 0 | 128 | return strcmp(orig->m_class, new->m_class) == 0 && |
129 | && ipv6_addr_equal(&orig->m_addr, &new->m_addr); | 129 | ipv6_addr_equal(&orig->m_addr, &new->m_addr); |
130 | } | 130 | } |
131 | static void ip_map_init(struct cache_head *cnew, struct cache_head *citem) | 131 | static void ip_map_init(struct cache_head *cnew, struct cache_head *citem) |
132 | { | 132 | { |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index 9e884383134f..f92e37eb413c 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | |||
@@ -337,10 +337,9 @@ static int rdma_set_ctxt_sge(struct svcxprt_rdma *xprt, | |||
337 | 337 | ||
338 | static int rdma_read_max_sge(struct svcxprt_rdma *xprt, int sge_count) | 338 | static int rdma_read_max_sge(struct svcxprt_rdma *xprt, int sge_count) |
339 | { | 339 | { |
340 | if ((RDMA_TRANSPORT_IWARP == | 340 | if ((rdma_node_get_transport(xprt->sc_cm_id->device->node_type) == |
341 | rdma_node_get_transport(xprt->sc_cm_id-> | 341 | RDMA_TRANSPORT_IWARP) && |
342 | device->node_type)) | 342 | sge_count > 1) |
343 | && sge_count > 1) | ||
344 | return 1; | 343 | return 1; |
345 | else | 344 | else |
346 | return min_t(int, sge_count, xprt->sc_max_sge); | 345 | return min_t(int, sge_count, xprt->sc_max_sge); |
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 465aafc2007f..2209aa87d899 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c | |||
@@ -878,8 +878,8 @@ if (strnicmp(ia->ri_id->device->dma_device->bus->name, "pci", 3) == 0) { | |||
878 | * others indicate a transport condition which has already | 878 | * others indicate a transport condition which has already |
879 | * undergone a best-effort. | 879 | * undergone a best-effort. |
880 | */ | 880 | */ |
881 | if (ep->rep_connected == -ECONNREFUSED | 881 | if (ep->rep_connected == -ECONNREFUSED && |
882 | && ++retry_count <= RDMA_CONNECT_RETRY_MAX) { | 882 | ++retry_count <= RDMA_CONNECT_RETRY_MAX) { |
883 | dprintk("RPC: %s: non-peer_reject, retry\n", __func__); | 883 | dprintk("RPC: %s: non-peer_reject, retry\n", __func__); |
884 | goto retry; | 884 | goto retry; |
885 | } | 885 | } |