lkml.org 
[lkml]   [2017]   [Jul]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/2] init/main.c: Fixes quoted string split across lines & missing blank line after declaration
On Fri, 28 Jul 2017 11:56:46 +0530
janani-sankarababu <jananis37@gmail.com> wrote:

> Signed-off-by: Janani S <jananis37@gmail.com>
> ---
> init/main.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/init/main.c b/init/main.c
> index f8eb4966..920b829 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -176,6 +176,7 @@ static bool __init obsolete_checksetup(char *line)
> p = __setup_start;
> do {
> int n = strlen(p->str);
> +

Not sure this is really needed. It's in a block and being assigned. The
code looks fine as is.

> if (parameqn(line, p->str, n)) {
> if (p->early) {
> /* Already done in parse_early_param?
> @@ -302,6 +303,7 @@ static int __init unknown_bootoption(char *param, char *val,
> if (val) {
> /* Environment option */
> unsigned int i;
> +
> for (i = 0; envp_init[i]; i++) {
> if (i == MAX_INIT_ENVS) {
> panic_later = "env";
> @@ -314,6 +316,7 @@ static int __init unknown_bootoption(char *param, char *val,
> } else {
> /* Command line option */
> unsigned int i;
> +

This breaks up the flow of the blocks. The real fix isn't to add blank
lines, but to remove both of these i declarations and add just a single
one at the top of the function.

> for (i = 0; argv_init[i]; i++) {
> if (i == MAX_INIT_ARGS) {
> panic_later = "init";
> @@ -1020,7 +1023,7 @@ static int __ref kernel_init(void *unused)
> !try_to_run_init_process("/bin/sh"))
> return 0;
>
> - panic("No working init found. Try passing init= option to kernel. "
> + panic("No working init found. Try passing init= option to kernel.\n"
> "See Linux Documentation/admin-guide/init.rst for guidance.");

This change is fine.

-- Steve

> }
>

\
 
 \ /
  Last update: 2017-07-28 14:31    [W:0.039 / U:1.868 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site