diff options
author | James Simmons <jsimmons@infradead.org> | 2016-02-12 12:06:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 16:20:32 -0800 |
commit | e767c84028677f56035eac1004532c8b9c12b5e1 (patch) | |
tree | d3f41e7bb97c1faaaf04f3452f117f4423ccfa2c /drivers/staging/lustre/lnet/lnet | |
parent | 0eee67781c98a47ba579d92159dcd39ce2cee639 (diff) | |
download | op-kernel-dev-e767c84028677f56035eac1004532c8b9c12b5e1.zip op-kernel-dev-e767c84028677f56035eac1004532c8b9c12b5e1.tar.gz |
staging: lustre: remove unnecessary blank lines reported by checkpatch.pl
Remove any useless blank lines reported by checkpatch.pl
for LNet layer.
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lnet/lnet')
-rw-r--r-- | drivers/staging/lustre/lnet/lnet/acceptor.c | 2 | ||||
-rw-r--r-- | drivers/staging/lustre/lnet/lnet/api-ni.c | 1 | ||||
-rw-r--r-- | drivers/staging/lustre/lnet/lnet/config.c | 6 | ||||
-rw-r--r-- | drivers/staging/lustre/lnet/lnet/lib-md.c | 1 | ||||
-rw-r--r-- | drivers/staging/lustre/lnet/lnet/lib-move.c | 2 | ||||
-rw-r--r-- | drivers/staging/lustre/lnet/lnet/lib-msg.c | 1 | ||||
-rw-r--r-- | drivers/staging/lustre/lnet/lnet/router.c | 1 |
7 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/lustre/lnet/lnet/acceptor.c b/drivers/staging/lustre/lnet/lnet/acceptor.c index b330f64..8c95cc5 100644 --- a/drivers/staging/lustre/lnet/lnet/acceptor.c +++ b/drivers/staging/lustre/lnet/lnet/acceptor.c @@ -223,7 +223,6 @@ lnet_accept(struct socket *sock, __u32 magic) LASSERT(rc == 0); /* we succeeded before */ if (!lnet_accept_magic(magic, LNET_PROTO_ACCEPTOR_MAGIC)) { - if (lnet_accept_magic(magic, LNET_PROTO_MAGIC)) { /* * future version compatibility! @@ -363,7 +362,6 @@ lnet_acceptor(void *arg) return rc; while (!lnet_acceptor_state.pta_shutdown) { - rc = lnet_sock_accept(&newsock, lnet_acceptor_state.pta_sock); if (rc != 0) { if (rc != -EAGAIN) { diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c index e59fbfb..78188a9 100644 --- a/drivers/staging/lustre/lnet/lnet/api-ni.c +++ b/drivers/staging/lustre/lnet/lnet/api-ni.c @@ -340,7 +340,6 @@ lnet_counters_get(lnet_counters_t *counters) counters->recv_length += ctr->recv_length; counters->route_length += ctr->route_length; counters->drop_length += ctr->drop_length; - } lnet_net_unlock(LNET_LOCK_EX); } diff --git a/drivers/staging/lustre/lnet/lnet/config.c b/drivers/staging/lustre/lnet/lnet/config.c index 5339dee..695db24 100644 --- a/drivers/staging/lustre/lnet/lnet/config.c +++ b/drivers/staging/lustre/lnet/lnet/config.c @@ -221,7 +221,6 @@ lnet_parse_networks(struct list_head *nilist, char *networks) * NB we don't check interface conflicts here; it's the LNDs * responsibility (if it cares at all) */ - if (square != NULL && (comma == NULL || square < comma)) { /* * i.e: o2ib0(ib0)[1,2], number between square @@ -251,7 +250,6 @@ lnet_parse_networks(struct list_head *nilist, char *networks) if (bracket == NULL || (comma != NULL && comma < bracket)) { - /* no interface list specified */ if (comma != NULL) @@ -528,7 +526,6 @@ lnet_str2tbs_expand(struct list_head *tbs, char *str) goto failed; for (parsed = sep; parsed < sep2; parsed = enditem) { - enditem = ++parsed; while (enditem < sep2 && *enditem != ',') enditem++; @@ -538,9 +535,7 @@ lnet_str2tbs_expand(struct list_head *tbs, char *str) if (sscanf(parsed, "%d-%d/%d%n", &lo, &hi, &stride, &scanned) < 3) { - if (sscanf(parsed, "%d-%d%n", &lo, &hi, &scanned) < 2) { - /* simple string enumeration */ if (lnet_expand1tb(&pending, str, sep, sep2, parsed, @@ -564,7 +559,6 @@ lnet_str2tbs_expand(struct list_head *tbs, char *str) goto failed; for (i = lo; i <= hi; i += stride) { - snprintf(num, sizeof(num), "%d", i); nob = strlen(num); if (nob + 1 == sizeof(num)) diff --git a/drivers/staging/lustre/lnet/lnet/lib-md.c b/drivers/staging/lustre/lnet/lnet/lib-md.c index fef517d..4d59bac 100644 --- a/drivers/staging/lustre/lnet/lnet/lib-md.c +++ b/drivers/staging/lustre/lnet/lnet/lib-md.c @@ -106,7 +106,6 @@ lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink) lmd->md_flags = (unlink == LNET_UNLINK) ? LNET_MD_FLAG_AUTO_UNLINK : 0; if ((umd->options & LNET_MD_IOVEC) != 0) { - if ((umd->options & LNET_MD_KIOV) != 0) /* Can't specify both */ return -EINVAL; diff --git a/drivers/staging/lustre/lnet/lnet/lib-move.c b/drivers/staging/lustre/lnet/lnet/lib-move.c index afc4522..12bb983 100644 --- a/drivers/staging/lustre/lnet/lnet/lib-move.c +++ b/drivers/staging/lustre/lnet/lnet/lib-move.c @@ -1726,7 +1726,6 @@ lnet_print_hdr(lnet_hdr_t *hdr) hdr->msg.reply.dst_wmd.wh_object_cookie, hdr->payload_length); } - } int @@ -1866,7 +1865,6 @@ lnet_parse(lnet_ni_t *ni, lnet_hdr_t *hdr, lnet_nid_t from_nid, /* msg zeroed in lnet_msg_alloc; * i.e. flags all clear, pointers NULL etc */ - msg->msg_type = type; msg->msg_private = private; msg->msg_receiving = 1; diff --git a/drivers/staging/lustre/lnet/lnet/lib-msg.c b/drivers/staging/lustre/lnet/lnet/lib-msg.c index a680e68..eb4aa34 100644 --- a/drivers/staging/lustre/lnet/lnet/lib-msg.c +++ b/drivers/staging/lustre/lnet/lnet/lib-msg.c @@ -74,7 +74,6 @@ lnet_build_msg_event(lnet_msg_t *msg, lnet_event_kind_t ev_type) ev->initiator.nid = LNET_NID_ANY; ev->initiator.pid = the_lnet.ln_pid; ev->sender = LNET_NID_ANY; - } else { /* event for passive message */ ev->target.pid = hdr->dest_pid; diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c index e447b1a..65f951c 100644 --- a/drivers/staging/lustre/lnet/lnet/router.c +++ b/drivers/staging/lustre/lnet/lnet/router.c @@ -353,7 +353,6 @@ lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway, CERROR("Error %d creating route %s %d %s\n", rc, libcfs_net2str(net), hops, libcfs_nid2str(gateway)); - return rc; } |