[PATCH] ipc/msg.c: Adjust indentation in ksys_msgctl

[PATCH] ipc/msg.c: Adjust indentation in ksys_msgctl

[Nathan Chancellor]

Clang warns:

../ipc/msg.c:621:4: warning: misleading indentation; statement is not
part of the previous 'if' [-Wmisleading-indentation]
                 return msgctl_down(ns, msqid, cmd, &msqid64.msg_perm,
msqid64.msg_qbytes);
                 ^
../ipc/msg.c:619:3: note: previous statement is here
                if (copy_msqid_from_user(&msqid64, buf, version))
                ^
1 warning generated.

This warning occurs because there is a space after the tab on this line.
Remove it so that the indentation is consistent with the Linux kernel
coding style and clang no longer warns.

Link: https://github.com/ClangBuiltLinux/linux/issues/829
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---

I assume this will be squashed into the offending patch since it is
still in -next:

https://git.kernel.org/next/linux-next/c/658622e448a6e6a6a69471daeff7e95e98d34ed1

 ipc/msg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ipc/msg.c b/ipc/msg.c
index 22ed09ded601..caca67368cb5 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -618,7 +618,8 @@ static long ksys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf, int ver
 	case IPC_SET:
 		if (copy_msqid_from_user(&msqid64, buf, version))
 			return -EFAULT;
-		 return msgctl_down(ns, msqid, cmd, &msqid64.msg_perm, msqid64.msg_qbytes);
+		return msgctl_down(ns, msqid, cmd, &msqid64.msg_perm,
+				   msqid64.msg_qbytes);
 	case IPC_RMID:
 		return msgctl_down(ns, msqid, cmd, NULL, 0);
 	default:
-- 
2.24.1

Re: [PATCH] ipc/msg.c: Adjust indentation in ksys_msgctl

[Nick Desaulniers]

On Tue, Dec 17, 2019 at 7:30 PM Nathan Chancellor
<natechancellor@gmail.com> wrote:
>
> Clang warns:
>
> ../ipc/msg.c:621:4: warning: misleading indentation; statement is not
> part of the previous 'if' [-Wmisleading-indentation]
>                  return msgctl_down(ns, msqid, cmd, &msqid64.msg_perm,
> msqid64.msg_qbytes);
>                  ^
> ../ipc/msg.c:619:3: note: previous statement is here
>                 if (copy_msqid_from_user(&msqid64, buf, version))
>                 ^
> 1 warning generated.
>
> This warning occurs because there is a space after the tab on this line.
> Remove it so that the indentation is consistent with the Linux kernel
> coding style and clang no longer warns.
>
> Link: https://github.com/ClangBuiltLinux/linux/issues/829
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Thanks for the patch!
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>

> ---
>
> I assume this will be squashed into the offending patch since it is
> still in -next:
>
> https://git.kernel.org/next/linux-next/c/658622e448a6e6a6a69471daeff7e95e98d34ed1
>
>  ipc/msg.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/ipc/msg.c b/ipc/msg.c
> index 22ed09ded601..caca67368cb5 100644
> --- a/ipc/msg.c
> +++ b/ipc/msg.c
> @@ -618,7 +618,8 @@ static long ksys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf, int ver
>         case IPC_SET:
>                 if (copy_msqid_from_user(&msqid64, buf, version))
>                         return -EFAULT;
> -                return msgctl_down(ns, msqid, cmd, &msqid64.msg_perm, msqid64.msg_qbytes);
> +               return msgctl_down(ns, msqid, cmd, &msqid64.msg_perm,
> +                                  msqid64.msg_qbytes);
>         case IPC_RMID:
>                 return msgctl_down(ns, msqid, cmd, NULL, 0);
>         default:
> --
> 2.24.1
>
> --
> You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to clang-built-linux+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20191218032932.37479-1-natechancellor%40gmail.com.



-- 
Thanks,
~Nick Desaulniers