Skip to content

L
linux
Commit 939af333 authored by Hatice ERTÜRK's avatar Hatice ERTÜRK Committed by Greg Kroah-Hartman
Browse files
Options

Staging: lustre: lnet: lnet: Remove space after the name of that function 

Fix checkpatch.pl issues with "space prohibited between function name
and open parenthesis" in router.c
Signed-off-by: default avatarHatice ERTURK <haticeerturk27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a71fe4fb
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
drivers/staging/lustre/lnet/lnet/router.c
View file @ 939af333
...@@ -225,7 +225,7 @@ lnet_rtr_decref_locked(lnet_peer_t *lp) ...@@ -225,7 +225,7 @@ lnet_rtr_decref_locked(lnet_peer_t *lp)
} }
lnet_remotenet_t * lnet_remotenet_t *
lnet_find_net_locked (__u32 net) lnet_find_net_locked(__u32 net)
{ {
lnet_remotenet_t *rnet; lnet_remotenet_t *rnet;
struct list_head *tmp; struct list_head *tmp;
...@@ -274,7 +274,7 @@ static void lnet_shuffle_seed(void) ...@@ -274,7 +274,7 @@ static void lnet_shuffle_seed(void)
/* NB expects LNET_LOCK held */ /* NB expects LNET_LOCK held */
static void static void
lnet_add_route_to_rnet (lnet_remotenet_t *rnet, lnet_route_t *route) lnet_add_route_to_rnet(lnet_remotenet_t *rnet, lnet_route_t *route)
{ {
unsigned int len = 0; unsigned int len = 0;
unsigned int offset = 0; unsigned int offset = 0;
...@@ -282,13 +282,13 @@ lnet_add_route_to_rnet (lnet_remotenet_t *rnet, lnet_route_t *route) ...@@ -282,13 +282,13 @@ lnet_add_route_to_rnet (lnet_remotenet_t *rnet, lnet_route_t *route)
lnet_shuffle_seed(); lnet_shuffle_seed();
list_for_each (e, &rnet->lrn_routes) { list_for_each(e, &rnet->lrn_routes) {
len++; len++;
} }
/* len+1 positions to add a new entry, also prevents division by 0 */ /* len+1 positions to add a new entry, also prevents division by 0 */
offset = cfs_rand() % (len + 1); offset = cfs_rand() % (len + 1);
list_for_each (e, &rnet->lrn_routes) { list_for_each(e, &rnet->lrn_routes) {
if (offset == 0) if (offset == 0)
break; break;
offset--; offset--;
...@@ -364,7 +364,7 @@ lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway, ...@@ -364,7 +364,7 @@ lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway,
return rc; return rc;
} }
LASSERT (!the_lnet.ln_shutdown); LASSERT(!the_lnet.ln_shutdown);
rnet2 = lnet_find_net_locked(net); rnet2 = lnet_find_net_locked(net);
if (rnet2 == NULL) { if (rnet2 == NULL) {
...@@ -375,7 +375,7 @@ lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway, ...@@ -375,7 +375,7 @@ lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway,
/* Search for a duplicate route (it's a NOOP if it is) */ /* Search for a duplicate route (it's a NOOP if it is) */
add_route = 1; add_route = 1;
list_for_each (e, &rnet2->lrn_routes) { list_for_each(e, &rnet2->lrn_routes) {
lnet_route_t *route2 = list_entry(e, lnet_route_t, lr_list); lnet_route_t *route2 = list_entry(e, lnet_route_t, lr_list);
if (route2->lr_gateway == route->lr_gateway) { if (route2->lr_gateway == route->lr_gateway) {
...@@ -384,7 +384,7 @@ lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway, ...@@ -384,7 +384,7 @@ lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway,
} }
/* our lookups must be true */ /* our lookups must be true */
LASSERT (route2->lr_gateway->lp_nid != gateway); LASSERT(route2->lr_gateway->lp_nid != gateway);
} }
if (add_route) { if (add_route) {
...@@ -546,7 +546,7 @@ lnet_del_route(__u32 net, lnet_nid_t gw_nid) ...@@ -546,7 +546,7 @@ lnet_del_route(__u32 net, lnet_nid_t gw_nid)
} }
void void
lnet_destroy_routes (void) lnet_destroy_routes(void)
{ {
lnet_del_route(LNET_NIDNET(LNET_NID_ANY), LNET_NID_ANY); lnet_del_route(LNET_NIDNET(LNET_NID_ANY), LNET_NID_ANY);
} }
...@@ -758,13 +758,13 @@ lnet_wait_known_routerstate(void) ...@@ -758,13 +758,13 @@ lnet_wait_known_routerstate(void)
struct list_head *entry; struct list_head *entry;
int all_known; int all_known;
LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING); LASSERT(the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING);
for (;;) { for (;;) {
int cpt = lnet_net_lock_current(); int cpt = lnet_net_lock_current();
all_known = 1; all_known = 1;
list_for_each (entry, &the_lnet.ln_routers) { list_for_each(entry, &the_lnet.ln_routers) {
rtr = list_entry(entry, lnet_peer_t, lp_rtr_list); rtr = list_entry(entry, lnet_peer_t, lp_rtr_list);
if (rtr->lp_alive_count == 0) { if (rtr->lp_alive_count == 0) {
...@@ -886,7 +886,7 @@ lnet_create_rc_data_locked(lnet_peer_t *gateway) ...@@ -886,7 +886,7 @@ lnet_create_rc_data_locked(lnet_peer_t *gateway)
} }
rcd->rcd_pinginfo = pi; rcd->rcd_pinginfo = pi;
LASSERT (!LNetHandleIsInvalid(the_lnet.ln_rc_eqh)); LASSERT(!LNetHandleIsInvalid(the_lnet.ln_rc_eqh));
rc = LNetMDBind((lnet_md_t){.start = pi, rc = LNetMDBind((lnet_md_t){.start = pi,
.user_ptr = rcd, .user_ptr = rcd,
.length = LNET_PINGINFO_SIZE, .length = LNET_PINGINFO_SIZE,
...@@ -929,7 +929,7 @@ lnet_create_rc_data_locked(lnet_peer_t *gateway) ...@@ -929,7 +929,7 @@ lnet_create_rc_data_locked(lnet_peer_t *gateway)
} }
static int static int
lnet_router_check_interval (lnet_peer_t *rtr) lnet_router_check_interval(lnet_peer_t *rtr)
{ {
int secs; int secs;
...@@ -942,7 +942,7 @@ lnet_router_check_interval (lnet_peer_t *rtr) ...@@ -942,7 +942,7 @@ lnet_router_check_interval (lnet_peer_t *rtr)
} }
static void static void
lnet_ping_router_locked (lnet_peer_t *rtr) lnet_ping_router_locked(lnet_peer_t *rtr)
{ {
lnet_rc_data_t *rcd = NULL; lnet_rc_data_t *rcd = NULL;
unsigned long now = cfs_time_current(); unsigned long now = cfs_time_current();
...@@ -1019,7 +1019,7 @@ lnet_router_checker_start(void) ...@@ -1019,7 +1019,7 @@ lnet_router_checker_start(void)
int rc; int rc;
int eqsz; int eqsz;
LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_SHUTDOWN); LASSERT(the_lnet.ln_rc_state == LNET_RC_STATE_SHUTDOWN);
if (check_routers_before_use && if (check_routers_before_use &&
dead_router_check_interval <= 0) { dead_router_check_interval <= 0) {
...@@ -1067,14 +1067,14 @@ lnet_router_checker_start(void) ...@@ -1067,14 +1067,14 @@ lnet_router_checker_start(void)
} }
void void
lnet_router_checker_stop (void) lnet_router_checker_stop(void)
{ {
int rc; int rc;
if (the_lnet.ln_rc_state == LNET_RC_STATE_SHUTDOWN) if (the_lnet.ln_rc_state == LNET_RC_STATE_SHUTDOWN)
return; return;
LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING); LASSERT(the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING);
the_lnet.ln_rc_state = LNET_RC_STATE_STOPPING; the_lnet.ln_rc_state = LNET_RC_STATE_STOPPING;
/* block until event callback signals exit */ /* block until event callback signals exit */
...@@ -1082,7 +1082,7 @@ lnet_router_checker_stop (void) ...@@ -1082,7 +1082,7 @@ lnet_router_checker_stop (void)
LASSERT(the_lnet.ln_rc_state == LNET_RC_STATE_SHUTDOWN); LASSERT(the_lnet.ln_rc_state == LNET_RC_STATE_SHUTDOWN);
rc = LNetEQFree(the_lnet.ln_rc_eqh); rc = LNetEQFree(the_lnet.ln_rc_eqh);
LASSERT (rc == 0); LASSERT(rc == 0);
return; return;
} }
...@@ -1178,7 +1178,7 @@ lnet_router_checker(void *arg) ...@@ -1178,7 +1178,7 @@ lnet_router_checker(void *arg)
cfs_block_allsigs(); cfs_block_allsigs();
LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING); LASSERT(the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING);
while (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING) { while (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING) {
__u64 version; __u64 version;
...@@ -1291,11 +1291,11 @@ lnet_rtrpool_free_bufs(lnet_rtrbufpool_t *rbp) ...@@ -1291,11 +1291,11 @@ lnet_rtrpool_free_bufs(lnet_rtrbufpool_t *rbp)
if (rbp->rbp_nbuffers == 0) /* not initialized or already freed */ if (rbp->rbp_nbuffers == 0) /* not initialized or already freed */
return; return;
LASSERT (list_empty(&rbp->rbp_msgs)); LASSERT(list_empty(&rbp->rbp_msgs));
LASSERT (rbp->rbp_credits == rbp->rbp_nbuffers); LASSERT(rbp->rbp_credits == rbp->rbp_nbuffers);
while (!list_empty(&rbp->rbp_bufs)) { while (!list_empty(&rbp->rbp_bufs)) {
LASSERT (rbp->rbp_credits > 0); LASSERT(rbp->rbp_credits > 0);
rb = list_entry(rbp->rbp_bufs.next, rb = list_entry(rbp->rbp_bufs.next,
lnet_rtrbuf_t, rb_list); lnet_rtrbuf_t, rb_list);
...@@ -1304,8 +1304,8 @@ lnet_rtrpool_free_bufs(lnet_rtrbufpool_t *rbp) ...@@ -1304,8 +1304,8 @@ lnet_rtrpool_free_bufs(lnet_rtrbufpool_t *rbp)
nbuffers++; nbuffers++;
} }
LASSERT (rbp->rbp_nbuffers == nbuffers); LASSERT(rbp->rbp_nbuffers == nbuffers);
LASSERT (rbp->rbp_credits == nbuffers); LASSERT(rbp->rbp_credits == nbuffers);
rbp->rbp_nbuffers = rbp->rbp_credits = 0; rbp->rbp_nbuffers = rbp->rbp_credits = 0;
} }
...@@ -1317,7 +1317,7 @@ lnet_rtrpool_alloc_bufs(lnet_rtrbufpool_t *rbp, int nbufs, int cpt) ...@@ -1317,7 +1317,7 @@ lnet_rtrpool_alloc_bufs(lnet_rtrbufpool_t *rbp, int nbufs, int cpt)
int i; int i;
if (rbp->rbp_nbuffers != 0) { if (rbp->rbp_nbuffers != 0) {
LASSERT (rbp->rbp_nbuffers == nbufs); LASSERT(rbp->rbp_nbuffers == nbufs);
return 0; return 0;
} }
...@@ -1337,10 +1337,10 @@ lnet_rtrpool_alloc_bufs(lnet_rtrbufpool_t *rbp, int nbufs, int cpt) ...@@ -1337,10 +1337,10 @@ lnet_rtrpool_alloc_bufs(lnet_rtrbufpool_t *rbp, int nbufs, int cpt)
/* No allocation "under fire" */ /* No allocation "under fire" */
/* Otherwise we'd need code to schedule blocked msgs etc */ /* Otherwise we'd need code to schedule blocked msgs etc */
LASSERT (!the_lnet.ln_routing); LASSERT(!the_lnet.ln_routing);
} }
LASSERT (rbp->rbp_credits == nbufs); LASSERT(rbp->rbp_credits == nbufs);
return 0; return 0;
} }
...@@ -1513,16 +1513,16 @@ lnet_notify(lnet_ni_t *ni, lnet_nid_t nid, int alive, unsigned long when) ...@@ -1513,16 +1513,16 @@ lnet_notify(lnet_ni_t *ni, lnet_nid_t nid, int alive, unsigned long when)
unsigned long now = cfs_time_current(); unsigned long now = cfs_time_current();
int cpt = lnet_cpt_of_nid(nid); int cpt = lnet_cpt_of_nid(nid);
LASSERT (!in_interrupt ()); LASSERT(!in_interrupt ());
CDEBUG (D_NET, "%s notifying %s: %s\n", CDEBUG(D_NET, "%s notifying %s: %s\n",
(ni == NULL) ? "userspace" : libcfs_nid2str(ni->ni_nid), (ni == NULL) ? "userspace" : libcfs_nid2str(ni->ni_nid),
libcfs_nid2str(nid), libcfs_nid2str(nid),
alive ? "up" : "down"); alive ? "up" : "down");
if (ni != NULL && if (ni != NULL &&
LNET_NIDNET(ni->ni_nid) != LNET_NIDNET(nid)) { LNET_NIDNET(ni->ni_nid) != LNET_NIDNET(nid)) {
CWARN ("Ignoring notification of %s %s by %s (different net)\n", CWARN("Ignoring notification of %s %s by %s (different net)\n",
libcfs_nid2str(nid), alive ? "birth" : "death", libcfs_nid2str(nid), alive ? "birth" : "death",
libcfs_nid2str(ni->ni_nid)); libcfs_nid2str(ni->ni_nid));
return -EINVAL; return -EINVAL;
...@@ -1577,7 +1577,7 @@ lnet_notify(lnet_ni_t *ni, lnet_nid_t nid, int alive, unsigned long when) ...@@ -1577,7 +1577,7 @@ lnet_notify(lnet_ni_t *ni, lnet_nid_t nid, int alive, unsigned long when)
EXPORT_SYMBOL(lnet_notify); EXPORT_SYMBOL(lnet_notify);
void void
lnet_get_tunables (void) lnet_get_tunables(void)
{ {
return; return;
} }
...@@ -1585,13 +1585,13 @@ lnet_get_tunables (void) ...@@ -1585,13 +1585,13 @@ lnet_get_tunables (void)
#else #else
int int
lnet_notify (lnet_ni_t *ni, lnet_nid_t nid, int alive, unsigned long when) lnet_notify(lnet_ni_t *ni, lnet_nid_t nid, int alive, unsigned long when)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
void void
lnet_router_checker (void) lnet_router_checker(void)
{ {
static time_t last; static time_t last;
static int running; static int running;
...@@ -1643,7 +1643,7 @@ lnet_router_checker (void) ...@@ -1643,7 +1643,7 @@ lnet_router_checker (void)
abort(); abort();
} }
LASSERT (rc == 1); LASSERT(rc == 1);
lnet_router_checker_event(&ev); lnet_router_checker_event(&ev);
} }
...@@ -1655,14 +1655,14 @@ lnet_router_checker (void) ...@@ -1655,14 +1655,14 @@ lnet_router_checker (void)
return; return;
} }
LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING); LASSERT(the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING);
lnet_net_lock(0); lnet_net_lock(0);
version = the_lnet.ln_routers_version; version = the_lnet.ln_routers_version;
list_for_each_entry (rtr, &the_lnet.ln_routers, lp_rtr_list) { list_for_each_entry(rtr, &the_lnet.ln_routers, lp_rtr_list) {
lnet_ping_router_locked(rtr); lnet_ping_router_locked(rtr);
LASSERT (version == the_lnet.ln_routers_version); LASSERT(version == the_lnet.ln_routers_version);
} }
lnet_net_unlock(0); lnet_net_unlock(0);
...@@ -1674,7 +1674,7 @@ lnet_router_checker (void) ...@@ -1674,7 +1674,7 @@ lnet_router_checker (void)
/* NB lnet_peers_start_down depends on me, /* NB lnet_peers_start_down depends on me,
* so must be called before any peer creation */ * so must be called before any peer creation */
void void
lnet_get_tunables (void) lnet_get_tunables(void)
{ {
char *s; char *s;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7