[OPW,kernel,2/3] Staging; lustre: Fix quoted string split across lines
diff mbox

Message ID 86dea2badfbc68f192756975628f061bbe8602d3.1382726938.git.rashika.kheria@gmail.com
State Accepted
Headers show

Commit Message

Rashika Oct. 25, 2013, 6:52 p.m. UTC
This patch fixes the following checkpatch.pl issues in
lnet/lnet/config.c:
WARNING: quoted string split across lines 
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
---
 drivers/staging/lustre/lnet/lnet/config.c |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

Comments

Lisa Nguyen Oct. 27, 2013, 8:24 p.m. UTC | #1
On Fri, Oct 25, 2013 at 11:52 AM, Rashika Kheria
<rashika.kheria@gmail.com> wrote:
> This patch fixes the following checkpatch.pl issues in
> lnet/lnet/config.c:
> WARNING: quoted string split across lines
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>

Greg applied this.

Lisa

> ---
>  drivers/staging/lustre/lnet/lnet/config.c |   28 ++++++++++++++--------------
>  1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/staging/lustre/lnet/lnet/config.c b/drivers/staging/lustre/lnet/lnet/config.c
> index 3307749..6328a0e 100644
> --- a/drivers/staging/lustre/lnet/lnet/config.c
> +++ b/drivers/staging/lustre/lnet/lnet/config.c
> @@ -188,8 +188,8 @@ lnet_parse_networks(struct list_head *nilist, char *networks)
>
>         if (strlen(networks) > LNET_SINGLE_TEXTBUF_NOB) {
>                 /* _WAY_ conservative */
> -               LCONSOLE_ERROR_MSG(0x112, "Can't parse networks: string too "
> -                                  "long\n");
> +               LCONSOLE_ERROR_MSG(0x112,
> +                                  "Can't parse networks: string too long\n");
>                 return -EINVAL;
>         }
>
> @@ -255,8 +255,8 @@ lnet_parse_networks(struct list_head *nilist, char *networks)
>                         net = libcfs_str2net(cfs_trimwhite(str));
>
>                         if (net == LNET_NIDNET(LNET_NID_ANY)) {
> -                               LCONSOLE_ERROR_MSG(0x113, "Unrecognised network"
> -                                                  " type\n");
> +                               LCONSOLE_ERROR_MSG(0x113,
> +                                                  "Unrecognised network type\n");
>                                 tmp = str;
>                                 goto failed_syntax;
>                         }
> @@ -313,8 +313,8 @@ lnet_parse_networks(struct list_head *nilist, char *networks)
>                         }
>
>                         if (niface == LNET_MAX_INTERFACES) {
> -                               LCONSOLE_ERROR_MSG(0x115, "Too many interfaces "
> -                                                  "for net %s\n",
> +                               LCONSOLE_ERROR_MSG(0x115,
> +                                                  "Too many interfaces for net %s\n",
>                                                    libcfs_net2str(net));
>                                 goto failed;
>                         }
> @@ -722,8 +722,7 @@ lnet_parse_route(char *str, int *im_a_router)
>
>                         rc = lnet_add_route(net, hops, nid);
>                         if (rc != 0) {
> -                               CERROR("Can't create route "
> -                                      "to %s via %s\n",
> +                               CERROR("Can't create route to %s via %s\n",
>                                        libcfs_net2str(net),
>                                        libcfs_nid2str(nid));
>                                 goto out;
> @@ -1156,14 +1155,15 @@ lnet_parse_ip2nets(char **networksp, char *ip2nets)
>         int     rc;
>
>         if (nip < 0) {
> -               LCONSOLE_ERROR_MSG(0x117, "Error %d enumerating local IP "
> -                                  "interfaces for ip2nets to match\n", nip);
> +               LCONSOLE_ERROR_MSG(0x117,
> +                                  "Error %d enumerating local IP interfaces for ip2nets to match\n",
> +                                  nip);
>                 return nip;
>         }
>
>         if (nip == 0) {
> -               LCONSOLE_ERROR_MSG(0x118, "No local IP interfaces "
> -                                  "for ip2nets to match\n");
> +               LCONSOLE_ERROR_MSG(0x118,
> +                                  "No local IP interfaces for ip2nets to match\n");
>                 return -ENOENT;
>         }
>
> @@ -1176,8 +1176,8 @@ lnet_parse_ip2nets(char **networksp, char *ip2nets)
>         }
>
>         if (rc == 0) {
> -               LCONSOLE_ERROR_MSG(0x11a, "ip2nets does not match "
> -                                  "any local IP interfaces\n");
> +               LCONSOLE_ERROR_MSG(0x11a,
> +                                  "ip2nets does not match any local IP interfaces\n");
>                 return -ENOENT;
>         }
>
> --
> 1.7.9.5
>
> --
> You received this message because you are subscribed to the Google Groups "opw-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to opw-kernel+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.

Patch
diff mbox

diff --git a/drivers/staging/lustre/lnet/lnet/config.c b/drivers/staging/lustre/lnet/lnet/config.c
index 3307749..6328a0e 100644
--- a/drivers/staging/lustre/lnet/lnet/config.c
+++ b/drivers/staging/lustre/lnet/lnet/config.c
@@ -188,8 +188,8 @@  lnet_parse_networks(struct list_head *nilist, char *networks)
 
 	if (strlen(networks) > LNET_SINGLE_TEXTBUF_NOB) {
 		/* _WAY_ conservative */
-		LCONSOLE_ERROR_MSG(0x112, "Can't parse networks: string too "
-				   "long\n");
+		LCONSOLE_ERROR_MSG(0x112,
+				   "Can't parse networks: string too long\n");
 		return -EINVAL;
 	}
 
@@ -255,8 +255,8 @@  lnet_parse_networks(struct list_head *nilist, char *networks)
 			net = libcfs_str2net(cfs_trimwhite(str));
 
 			if (net == LNET_NIDNET(LNET_NID_ANY)) {
-				LCONSOLE_ERROR_MSG(0x113, "Unrecognised network"
-						   " type\n");
+				LCONSOLE_ERROR_MSG(0x113,
+						   "Unrecognised network type\n");
 				tmp = str;
 				goto failed_syntax;
 			}
@@ -313,8 +313,8 @@  lnet_parse_networks(struct list_head *nilist, char *networks)
 			}
 
 			if (niface == LNET_MAX_INTERFACES) {
-				LCONSOLE_ERROR_MSG(0x115, "Too many interfaces "
-						   "for net %s\n",
+				LCONSOLE_ERROR_MSG(0x115,
+						   "Too many interfaces for net %s\n",
 						   libcfs_net2str(net));
 				goto failed;
 			}
@@ -722,8 +722,7 @@  lnet_parse_route(char *str, int *im_a_router)
 
 			rc = lnet_add_route(net, hops, nid);
 			if (rc != 0) {
-				CERROR("Can't create route "
-				       "to %s via %s\n",
+				CERROR("Can't create route to %s via %s\n",
 				       libcfs_net2str(net),
 				       libcfs_nid2str(nid));
 				goto out;
@@ -1156,14 +1155,15 @@  lnet_parse_ip2nets(char **networksp, char *ip2nets)
 	int	rc;
 
 	if (nip < 0) {
-		LCONSOLE_ERROR_MSG(0x117, "Error %d enumerating local IP "
-				   "interfaces for ip2nets to match\n", nip);
+		LCONSOLE_ERROR_MSG(0x117,
+				   "Error %d enumerating local IP interfaces for ip2nets to match\n",
+				   nip);
 		return nip;
 	}
 
 	if (nip == 0) {
-		LCONSOLE_ERROR_MSG(0x118, "No local IP interfaces "
-				   "for ip2nets to match\n");
+		LCONSOLE_ERROR_MSG(0x118,
+				   "No local IP interfaces for ip2nets to match\n");
 		return -ENOENT;
 	}
 
@@ -1176,8 +1176,8 @@  lnet_parse_ip2nets(char **networksp, char *ip2nets)
 	}
 
 	if (rc == 0) {
-		LCONSOLE_ERROR_MSG(0x11a, "ip2nets does not match "
-				   "any local IP interfaces\n");
+		LCONSOLE_ERROR_MSG(0x11a,
+				   "ip2nets does not match any local IP interfaces\n");
 		return -ENOENT;
 	}