2:16 a.m.
This patch fixes lines longer than the 80 char limit.
Signed-off-by: Redha Gouicem <redha.gouicem(a)gmail.com>
---
drivers/staging/lustre/lnet/lnet/router.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/lustre/lnet/lnet/router.c
b/drivers/staging/lustre/lnet/lnet/router.c
index c0a6aeb..568a31f 100644
--- a/drivers/staging/lustre/lnet/lnet/router.c
+++ b/drivers/staging/lustre/lnet/lnet/router.c
@@ -107,7 +107,8 @@ lnet_peers_start_down(void)
}
void
-lnet_notify_locked(lnet_peer_t *lp, int notifylnd, int alive, unsigned long when)
+lnet_notify_locked(lnet_peer_t *lp, int notifylnd, int alive,
+ unsigned long when)
{
if (time_before(when, lp->lp_timestamp)) { /* out of date information */
CDEBUG(D_NET, "Out of date\n");
@@ -1435,7 +1436,7 @@ int
lnet_rtrpools_alloc(int im_a_router)
{
lnet_rtrbufpool_t *rtrp;
- int large_pages = (LNET_MTU + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
+ int large_pages;
int small_pages = 1;
int nrb_tiny;
int nrb_small;
@@ -1443,6 +1444,8 @@ lnet_rtrpools_alloc(int im_a_router)
int rc;
int i;
+ large_pages = (LNET_MTU + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
+
if (!strcmp(forwarding, "")) {
/* not set either way */
if (!im_a_router)
--
1.9.1
2:16 a.m.
New subject: [PATCH 2/2] Staging: lustre: lnet: lnet: router.c: fix useless returns and elses
This patch removes useless returns and elses.
Signed-off-by: Redha Gouicem <redha.gouicem(a)gmail.com>
---
drivers/staging/lustre/lnet/lnet/router.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/lustre/lnet/lnet/router.c
b/drivers/staging/lustre/lnet/lnet/router.c
index 568a31f..8510bae 100644
--- a/drivers/staging/lustre/lnet/lnet/router.c
+++ b/drivers/staging/lustre/lnet/lnet/router.c
@@ -270,7 +270,6 @@ static void lnet_shuffle_seed(void)
do_gettimeofday(&tv);
cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
seeded = 1;
- return;
}
/* NB expects LNET_LOCK held */
@@ -355,13 +354,12 @@ lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway,
LIBCFS_FREE(route, sizeof(*route));
LIBCFS_FREE(rnet, sizeof(*rnet));
- if (rc == -EHOSTUNREACH) { /* gateway is not on a local net */
+ if (rc == -EHOSTUNREACH) /* gateway is not on a local net */
return 0; /* ignore the route entry */
- } else {
- CERROR("Error %d creating route %s %d %s\n", rc,
- libcfs_net2str(net), hops,
- libcfs_nid2str(gateway));
- }
+ CERROR("Error %d creating route %s %d %s\n", rc,
+ libcfs_net2str(net), hops,
+ libcfs_nid2str(gateway));
+
return rc;
}
@@ -607,7 +605,6 @@ lnet_swap_pinginfo(lnet_ping_info_t *info)
__swab64s(&stat->ns_nid);
__swab32s(&stat->ns_status);
}
- return;
}
/**
@@ -1011,7 +1008,6 @@ lnet_ping_router_locked(lnet_peer_t *rtr)
}
lnet_peer_decref_locked(rtr);
- return;
}
int
@@ -1084,7 +1080,6 @@ lnet_router_checker_stop(void)
rc = LNetEQFree(the_lnet.ln_rc_eqh);
LASSERT(rc == 0);
- return;
}
static void
@@ -1582,7 +1577,6 @@ EXPORT_SYMBOL(lnet_notify);
void
lnet_get_tunables(void)
{
- return;
}
#else
@@ -1671,7 +1665,6 @@ lnet_router_checker(void)
lnet_net_unlock(0);
running = 0; /* lock only needed for the recursion check */
- return;
}
/* NB lnet_peers_start_down depends on me,
--
1.9.1
6:20 a.m.
New subject: [PATCH 2/2] Staging: lustre: lnet: lnet: router.c: fix useless returns and elses
Hm. I like that else - it is not strictly necessary, but it adds readability by making
clear that the error is a direct consequence of failing that if test. Perhaps I've
missed a convention that says we should remove it, but if not, I prefer it as is. The
other changes look good to me.
________________________________________
From: HPDD-discuss [hpdd-discuss-bounces(a)lists.01.org] on behalf of Redha Gouicem
[redha.gouicem(a)gmail.com]
Sent: Thursday, March 19, 2015 4:16 AM
To: gregkh(a)linuxfoundation.org
Cc: HPDD-discuss(a)lists.01.org; Redha Gouicem
Subject: [HPDD-discuss] [PATCH 2/2] Staging: lustre: lnet: lnet: router.c: fix
useless returns and elses
This patch removes useless returns and elses.
Signed-off-by: Redha Gouicem <redha.gouicem(a)gmail.com>
---
drivers/staging/lustre/lnet/lnet/router.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/lustre/lnet/lnet/router.c
b/drivers/staging/lustre/lnet/lnet/router.c
index 568a31f..8510bae 100644
--- a/drivers/staging/lustre/lnet/lnet/router.c
+++ b/drivers/staging/lustre/lnet/lnet/router.c
@@ -270,7 +270,6 @@ static void lnet_shuffle_seed(void)
do_gettimeofday(&tv);
cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
seeded = 1;
- return;
}
/* NB expects LNET_LOCK held */
@@ -355,13 +354,12 @@ lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway,
LIBCFS_FREE(route, sizeof(*route));
LIBCFS_FREE(rnet, sizeof(*rnet));
- if (rc == -EHOSTUNREACH) { /* gateway is not on a local net */
+ if (rc == -EHOSTUNREACH) /* gateway is not on a local net */
return 0; /* ignore the route entry */
- } else {
- CERROR("Error %d creating route %s %d %s\n", rc,
- libcfs_net2str(net), hops,
- libcfs_nid2str(gateway));
- }
+ CERROR("Error %d creating route %s %d %s\n", rc,
+ libcfs_net2str(net), hops,
+ libcfs_nid2str(gateway));
+
return rc;
}
@@ -607,7 +605,6 @@ lnet_swap_pinginfo(lnet_ping_info_t *info)
__swab64s(&stat->ns_nid);
__swab32s(&stat->ns_status);
}
- return;
}
/**
@@ -1011,7 +1008,6 @@ lnet_ping_router_locked(lnet_peer_t *rtr)
}
lnet_peer_decref_locked(rtr);
- return;
}
int
@@ -1084,7 +1080,6 @@ lnet_router_checker_stop(void)
rc = LNetEQFree(the_lnet.ln_rc_eqh);
LASSERT(rc == 0);
- return;
}
static void
@@ -1582,7 +1577,6 @@ EXPORT_SYMBOL(lnet_notify);
void
lnet_get_tunables(void)
{
- return;
}
#else
@@ -1671,7 +1665,6 @@ lnet_router_checker(void)
lnet_net_unlock(0);
running = 0; /* lock only needed for the recursion check */
- return;
}
/* NB lnet_peers_start_down depends on me,
--
1.9.1
_______________________________________________
HPDD-discuss mailing list
HPDD-discuss(a)lists.01.org
https://lists.01.org/mailman/listinfo/hpdd-discuss
6:35 a.m.
New subject: [PATCH 2/2] Staging: lustre: lnet: lnet: router.c: fix useless returns and elses
On Thu, Mar 19, 2015 at 01:20:02PM +0000, Patrick Farrell wrote:
Hm. I like that else - it is not strictly necessary, but it adds
readability by making clear that the error is a direct consequence of
failing that if test. Perhaps I've missed a convention that says we
should remove it, but if not, I prefer it as is. The other changes
look good to me.
It's an additional indentation that isn't needed, and the code is now
more readable.
Also, yes, it's a convention to make this type of change, look at the
result of the checkpatch.pl tool, it highlighed this problem in the
file.
thanks,
greg k-h
2661
days inactive
2661
days old
3 comments
3 participants
participants (3)
-
gregkh＠linuxfoundation.org -
Patrick Farrell -
Redha Gouicem