Skip to content

L
linux
Commit 5129097b authored by Rashika Kheria's avatar Rashika Kheria Committed by Greg Kroah-Hartman
Browse files
Options

Staging: lustre: Fix quoted strings split across lines 

This patch fixes the following checkpatch.pl issues in lnet/lnet/acceptor.c:
WARNING: quoted string split across lines
Signed-off-by: default avatarRashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: default avatarLisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 735c2e26
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 43 deletions
drivers/staging/lustre/lnet/lnet/acceptor.c
View file @ 5129097b
...@@ -99,51 +99,39 @@ lnet_connect_console_error(int rc, lnet_nid_t peer_nid, ...@@ -99,51 +99,39 @@ lnet_connect_console_error(int rc, lnet_nid_t peer_nid,
switch (rc) { switch (rc) {
/* "normal" errors */ /* "normal" errors */
case -ECONNREFUSED: case -ECONNREFUSED:
CNETERR("Connection to %s at host %pI4h on port %d was " CNETERR("Connection to %s at host %pI4h on port %d was refused: check that Lustre is running on that node.\n",
"refused: check that Lustre is running on that node.\n",
libcfs_nid2str(peer_nid), libcfs_nid2str(peer_nid),
&peer_ip, peer_port); &peer_ip, peer_port);
break; break;
case -EHOSTUNREACH: case -EHOSTUNREACH:
case -ENETUNREACH: case -ENETUNREACH:
CNETERR("Connection to %s at host %pI4h " CNETERR("Connection to %s at host %pI4h was unreachable: the network or that node may be down, or Lustre may be misconfigured.\n",
"was unreachable: the network or that node may "
"be down, or Lustre may be misconfigured.\n",
libcfs_nid2str(peer_nid), &peer_ip); libcfs_nid2str(peer_nid), &peer_ip);
break; break;
case -ETIMEDOUT: case -ETIMEDOUT:
CNETERR("Connection to %s at host %pI4h on " CNETERR("Connection to %s at host %pI4h on port %d took too long: that node may be hung or experiencing high load.\n",
"port %d took too long: that node may be hung "
"or experiencing high load.\n",
libcfs_nid2str(peer_nid), libcfs_nid2str(peer_nid),
&peer_ip, peer_port); &peer_ip, peer_port);
break; break;
case -ECONNRESET: case -ECONNRESET:
LCONSOLE_ERROR_MSG(0x11b, "Connection to %s at host %pI4h" LCONSOLE_ERROR_MSG(0x11b, "Connection to %s at host %pI4h on port %d was reset: is it running a compatible version of Lustre and is %s one of its NIDs?\n",
" on port %d was reset: "
"is it running a compatible version of "
"Lustre and is %s one of its NIDs?\n",
libcfs_nid2str(peer_nid), libcfs_nid2str(peer_nid),
&peer_ip, peer_port, &peer_ip, peer_port,
libcfs_nid2str(peer_nid)); libcfs_nid2str(peer_nid));
break; break;
case -EPROTO: case -EPROTO:
LCONSOLE_ERROR_MSG(0x11c, "Protocol error connecting to %s at " LCONSOLE_ERROR_MSG(0x11c, "Protocol error connecting to %s at host %pI4h on port %d: is it running a compatible version of Lustre?\n",
"host %pI4h on port %d: is it running "
"a compatible version of Lustre?\n",
libcfs_nid2str(peer_nid), libcfs_nid2str(peer_nid),
&peer_ip, peer_port); &peer_ip, peer_port);
break; break;
case -EADDRINUSE: case -EADDRINUSE:
LCONSOLE_ERROR_MSG(0x11d, "No privileged ports available to " LCONSOLE_ERROR_MSG(0x11d, "No privileged ports available to connect to %s at host %pI4h on port %d\n",
"connect to %s at host %pI4h on port " libcfs_nid2str(peer_nid),
"%d\n", libcfs_nid2str(peer_nid),
&peer_ip, peer_port); &peer_ip, peer_port);
break; break;
default: default:
LCONSOLE_ERROR_MSG(0x11e, "Unexpected error %d connecting to %s" LCONSOLE_ERROR_MSG(0x11e, "Unexpected error %d connecting to %s at host %pI4h on port %d\n",
" at host %pI4h on port %d\n", rc, rc, libcfs_nid2str(peer_nid),
libcfs_nid2str(peer_nid),
&peer_ip, peer_port); &peer_ip, peer_port);
break; break;
} }
...@@ -250,8 +238,7 @@ lnet_accept(socket_t *sock, __u32 magic) ...@@ -250,8 +238,7 @@ lnet_accept(socket_t *sock, __u32 magic)
accept_timeout); accept_timeout);
if (rc != 0) if (rc != 0)
CERROR("Error sending magic+version in response" CERROR("Error sending magic+version in response to LNET magic from %pI4h: %d\n",
"to LNET magic from %pI4h: %d\n",
&peer_ip, rc); &peer_ip, rc);
return -EPROTO; return -EPROTO;
} }
...@@ -263,8 +250,7 @@ lnet_accept(socket_t *sock, __u32 magic) ...@@ -263,8 +250,7 @@ lnet_accept(socket_t *sock, __u32 magic)
else else
str = "unrecognised"; str = "unrecognised";
LCONSOLE_ERROR_MSG(0x11f, "Refusing connection from %pI4h" LCONSOLE_ERROR_MSG(0x11f, "Refusing connection from %pI4h magic %08x: %s acceptor protocol\n",
" magic %08x: %s acceptor protocol\n",
&peer_ip, magic, str); &peer_ip, magic, str);
return -EPROTO; return -EPROTO;
} }
...@@ -275,8 +261,8 @@ lnet_accept(socket_t *sock, __u32 magic) ...@@ -275,8 +261,8 @@ lnet_accept(socket_t *sock, __u32 magic)
sizeof(cr.acr_version), sizeof(cr.acr_version),
accept_timeout); accept_timeout);
if (rc != 0) { if (rc != 0) {
CERROR("Error %d reading connection request version from " CERROR("Error %d reading connection request version from %pI4h\n",
"%pI4h\n", rc, &peer_ip); rc, &peer_ip);
return -EIO; return -EIO;
} }
...@@ -298,8 +284,7 @@ lnet_accept(socket_t *sock, __u32 magic) ...@@ -298,8 +284,7 @@ lnet_accept(socket_t *sock, __u32 magic)
accept_timeout); accept_timeout);
if (rc != 0) if (rc != 0)
CERROR("Error sending magic+version in response" CERROR("Error sending magic+version in response to version %d from %pI4h: %d\n",
"to version %d from %pI4h: %d\n",
peer_version, &peer_ip, rc); peer_version, &peer_ip, rc);
return -EPROTO; return -EPROTO;
} }
...@@ -309,8 +294,8 @@ lnet_accept(socket_t *sock, __u32 magic) ...@@ -309,8 +294,8 @@ lnet_accept(socket_t *sock, __u32 magic)
offsetof(lnet_acceptor_connreq_t, acr_nid), offsetof(lnet_acceptor_connreq_t, acr_nid),
accept_timeout); accept_timeout);
if (rc != 0) { if (rc != 0) {
CERROR("Error %d reading connection request from " CERROR("Error %d reading connection request from %pI4h\n",
"%pI4h\n", rc, &peer_ip); rc, &peer_ip);
return -EIO; return -EIO;
} }
...@@ -322,8 +307,7 @@ lnet_accept(socket_t *sock, __u32 magic) ...@@ -322,8 +307,7 @@ lnet_accept(socket_t *sock, __u32 magic)
ni->ni_nid != cr.acr_nid) { /* right NET, wrong NID! */ ni->ni_nid != cr.acr_nid) { /* right NET, wrong NID! */
if (ni != NULL) if (ni != NULL)
lnet_ni_decref(ni); lnet_ni_decref(ni);
LCONSOLE_ERROR_MSG(0x120, "Refusing connection from %pI4h" LCONSOLE_ERROR_MSG(0x120, "Refusing connection from %pI4h for %s: No matching NI\n",
" for %s: No matching NI\n",
&peer_ip, libcfs_nid2str(cr.acr_nid)); &peer_ip, libcfs_nid2str(cr.acr_nid));
return -EPERM; return -EPERM;
} }
...@@ -331,8 +315,7 @@ lnet_accept(socket_t *sock, __u32 magic) ...@@ -331,8 +315,7 @@ lnet_accept(socket_t *sock, __u32 magic)
if (ni->ni_lnd->lnd_accept == NULL) { if (ni->ni_lnd->lnd_accept == NULL) {
/* This catches a request for the loopback LND */ /* This catches a request for the loopback LND */
lnet_ni_decref(ni); lnet_ni_decref(ni);
LCONSOLE_ERROR_MSG(0x121, "Refusing connection from %pI4h" LCONSOLE_ERROR_MSG(0x121, "Refusing connection from %pI4h for %s: NI doesn not accept IP connections\n",
" for %s: NI doesn not accept IP connections\n",
&peer_ip, libcfs_nid2str(cr.acr_nid)); &peer_ip, libcfs_nid2str(cr.acr_nid));
return -EPERM; return -EPERM;
} }
...@@ -364,12 +347,10 @@ lnet_acceptor(void *arg) ...@@ -364,12 +347,10 @@ lnet_acceptor(void *arg)
0, accept_port, accept_backlog); 0, accept_port, accept_backlog);
if (rc != 0) { if (rc != 0) {
if (rc == -EADDRINUSE) if (rc == -EADDRINUSE)
LCONSOLE_ERROR_MSG(0x122, "Can't start acceptor on port" LCONSOLE_ERROR_MSG(0x122, "Can't start acceptor on port %d: port already in use\n",
" %d: port already in use\n",
accept_port); accept_port);
else else
LCONSOLE_ERROR_MSG(0x123, "Can't start acceptor on port " LCONSOLE_ERROR_MSG(0x123, "Can't start acceptor on port %d: unexpected error %d\n",
"%d: unexpected error %d\n",
accept_port, rc); accept_port, rc);
lnet_acceptor_state.pta_sock = NULL; lnet_acceptor_state.pta_sock = NULL;
...@@ -408,8 +389,7 @@ lnet_acceptor(void *arg) ...@@ -408,8 +389,7 @@ lnet_acceptor(void *arg)
} }
if (secure && peer_port > LNET_ACCEPTOR_MAX_RESERVED_PORT) { if (secure && peer_port > LNET_ACCEPTOR_MAX_RESERVED_PORT) {
CERROR("Refusing connection from %pI4h: " CERROR("Refusing connection from %pI4h: insecure port %d\n",
"insecure port %d\n",
&peer_ip, peer_port); &peer_ip, peer_port);
goto failed; goto failed;
} }
...@@ -417,8 +397,8 @@ lnet_acceptor(void *arg) ...@@ -417,8 +397,8 @@ lnet_acceptor(void *arg)
rc = libcfs_sock_read(newsock, &magic, sizeof(magic), rc = libcfs_sock_read(newsock, &magic, sizeof(magic),
accept_timeout); accept_timeout);
if (rc != 0) { if (rc != 0) {
CERROR("Error %d reading connection request from " CERROR("Error %d reading connection request from %pI4h\n",
"%pI4h\n", rc, &peer_ip); rc, &peer_ip);
goto failed; goto failed;
} }
......
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