Re: [PATCH] staging: lustre: lnet: klnds: Remove prohibited space in socklnd.c

2014-05-23 Thread Greg KH
On Wed, May 21, 2014 at 11:23:33PM +0100, Masaru Nomura wrote:
 Remove prohibited space between function name and open parenthesis
 to meet kernel coding style. Also, fix indenting due to changes.
 
 Signed-off-by: Masaru Nomura massa.nom...@gmail.com
 ---
  .../staging/lustre/lnet/klnds/socklnd/socklnd.c|  230 
 ++--
  1 file changed, 116 insertions(+), 114 deletions(-)

This patch doesn't apply either, please refresh and resend.

thanks,

greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] staging: lustre: lnet: klnds: Remove prohibited space in socklnd.c

2014-05-21 Thread Masaru Nomura
Remove prohibited space between function name and open parenthesis
to meet kernel coding style. Also, fix indenting due to changes.

Signed-off-by: Masaru Nomura massa.nom...@gmail.com
---
 .../staging/lustre/lnet/klnds/socklnd/socklnd.c|  230 ++--
 1 file changed, 116 insertions(+), 114 deletions(-)

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c 
b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
index a391d13..6354491 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
@@ -1351,8 +1351,8 @@ ksocknal_create_conn (lnet_ni_t *ni, ksock_route_t *route,
 
  failed_2:
if (!peer-ksnp_closing 
-   list_empty (peer-ksnp_conns) 
-   list_empty (peer-ksnp_routes)) {
+   list_empty(peer-ksnp_conns) 
+   list_empty(peer-ksnp_routes)) {
list_add(zombies, peer-ksnp_tx_queue);
list_del_init(peer-ksnp_tx_queue);
ksocknal_unlink_peer_locked(peer);
@@ -1391,7 +1391,7 @@ ksocknal_create_conn (lnet_ni_t *ni, ksock_route_t *route,
LIBCFS_FREE(hello, offsetof(ksock_hello_msg_t,
kshm_ips[LNET_MAX_INTERFACES]));
 
-   LIBCFS_FREE (conn, sizeof(*conn));
+   LIBCFS_FREE(conn, sizeof(*conn));
 
  failed_0:
libcfs_sock_release(sock);
@@ -1399,7 +1399,7 @@ ksocknal_create_conn (lnet_ni_t *ni, ksock_route_t *route,
 }
 
 void
-ksocknal_close_conn_locked (ksock_conn_t *conn, int error)
+ksocknal_close_conn_locked(ksock_conn_t *conn, int error)
 {
/* This just does the immmediate housekeeping, and queues the
 * connection for the reaper to terminate.
@@ -1409,18 +1409,18 @@ ksocknal_close_conn_locked (ksock_conn_t *conn, int 
error)
ksock_conn_t  *conn2;
struct list_head*tmp;
 
-   LASSERT (peer-ksnp_error == 0);
-   LASSERT (!conn-ksnc_closing);
+   LASSERT(peer-ksnp_error == 0);
+   LASSERT(!conn-ksnc_closing);
conn-ksnc_closing = 1;
 
/* ksnd_deathrow_conns takes over peer's ref */
-   list_del (conn-ksnc_list);
+   list_del(conn-ksnc_list);
 
route = conn-ksnc_route;
if (route != NULL) {
/* dissociate conn from route... */
-   LASSERT (!route-ksnr_deleted);
-   LASSERT ((route-ksnr_connected  (1  conn-ksnc_type)) != 0);
+   LASSERT(!route-ksnr_deleted);
+   LASSERT((route-ksnr_connected  (1  conn-ksnc_type)) != 0);
 
conn2 = NULL;
list_for_each(tmp, peer-ksnp_conns) {
@@ -1439,19 +1439,19 @@ ksocknal_close_conn_locked (ksock_conn_t *conn, int 
error)
 
 #if 0 /* irrelevant with only eager routes */
/* make route least favourite */
-   list_del (route-ksnr_list);
-   list_add_tail (route-ksnr_list, peer-ksnp_routes);
+   list_del(route-ksnr_list);
+   list_add_tail(route-ksnr_list, peer-ksnp_routes);
 #endif
ksocknal_route_decref(route); /* drop conn's ref on route */
}
 
-   if (list_empty (peer-ksnp_conns)) {
+   if (list_empty(peer-ksnp_conns)) {
/* No more connections to this peer */
 
if (!list_empty(peer-ksnp_tx_queue)) {
ksock_tx_t *tx;
 
-   LASSERT (conn-ksnc_proto == ksocknal_protocol_v3x);
+   LASSERT(conn-ksnc_proto == ksocknal_protocol_v3x);
 
/* throw them to the last connection...,
 * these TXs will be send to /dev/null by scheduler */
@@ -1468,10 +1468,10 @@ ksocknal_close_conn_locked (ksock_conn_t *conn, int 
error)
peer-ksnp_proto = NULL;/* renegotiate protocol version 
*/
peer-ksnp_error = error;   /* stash last conn close reason 
*/
 
-   if (list_empty (peer-ksnp_routes)) {
+   if (list_empty(peer-ksnp_routes)) {
/* I've just closed last conn belonging to a
 * peer with no routes to it */
-   ksocknal_unlink_peer_locked (peer);
+   ksocknal_unlink_peer_locked(peer);
}
}
 
@@ -1485,7 +1485,7 @@ ksocknal_close_conn_locked (ksock_conn_t *conn, int error)
 }
 
 void
-ksocknal_peer_failed (ksock_peer_t *peer)
+ksocknal_peer_failed(ksock_peer_t *peer)
 {
int notify = 0;
cfs_time_t last_alive = 0;
@@ -1507,8 +1507,8 @@ ksocknal_peer_failed (ksock_peer_t *peer)
read_unlock(ksocknal_data.ksnd_global_lock);
 
if (notify)
-   lnet_notify (peer-ksnp_ni, peer-ksnp_id.nid, 0,
-last_alive);
+   lnet_notify(peer-ksnp_ni, peer-ksnp_id.nid, 0,
+   last_alive);
 }
 
 void
@@ -1521,7 +1521,7 @@ ksocknal_finalize_zcreq(ksock_conn_t *conn)