linux-cifs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] cifs: Adjust indentation in smb2_open_file
@ 2019-12-18  3:04 Nathan Chancellor
  2019-12-20  1:42 ` Steve French
  0 siblings, 1 reply; 2+ messages in thread
From: Nathan Chancellor @ 2019-12-18  3:04 UTC (permalink / raw)
  To: Steve French
  Cc: linux-cifs, samba-technical, linux-kernel, clang-built-linux,
	Nathan Chancellor

Clang warns:

../fs/cifs/smb2file.c:70:3: warning: misleading indentation; statement
is not part of the previous 'if' [-Wmisleading-indentation]
         if (oparms->tcon->use_resilient) {
         ^
../fs/cifs/smb2file.c:66:2: note: previous statement is here
        if (rc)
        ^
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.

Fixes: 592fafe644bf ("Add resilienthandles mount parm")
Link: https://github.com/ClangBuiltLinux/linux/issues/826
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
 fs/cifs/smb2file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c
index 8b0b512c5792..afe1f03aabe3 100644
--- a/fs/cifs/smb2file.c
+++ b/fs/cifs/smb2file.c
@@ -67,7 +67,7 @@ smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms,
 		goto out;
 
 
-	 if (oparms->tcon->use_resilient) {
+	if (oparms->tcon->use_resilient) {
 		/* default timeout is 0, servers pick default (120 seconds) */
 		nr_ioctl_req.Timeout =
 			cpu_to_le32(oparms->tcon->handle_timeout);
-- 
2.24.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] cifs: Adjust indentation in smb2_open_file
  2019-12-18  3:04 [PATCH] cifs: Adjust indentation in smb2_open_file Nathan Chancellor
@ 2019-12-20  1:42 ` Steve French
  0 siblings, 0 replies; 2+ messages in thread
From: Steve French @ 2019-12-20  1:42 UTC (permalink / raw)
  To: Nathan Chancellor; +Cc: CIFS, samba-technical, LKML, clang-built-linux

merged into cifs-2.6.git for-next

On Tue, Dec 17, 2019 at 9:04 PM Nathan Chancellor
<natechancellor@gmail.com> wrote:
>
> Clang warns:
>
> ../fs/cifs/smb2file.c:70:3: warning: misleading indentation; statement
> is not part of the previous 'if' [-Wmisleading-indentation]
>          if (oparms->tcon->use_resilient) {
>          ^
> ../fs/cifs/smb2file.c:66:2: note: previous statement is here
>         if (rc)
>         ^
> 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.
>
> Fixes: 592fafe644bf ("Add resilienthandles mount parm")
> Link: https://github.com/ClangBuiltLinux/linux/issues/826
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> ---
>  fs/cifs/smb2file.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c
> index 8b0b512c5792..afe1f03aabe3 100644
> --- a/fs/cifs/smb2file.c
> +++ b/fs/cifs/smb2file.c
> @@ -67,7 +67,7 @@ smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms,
>                 goto out;
>
>
> -        if (oparms->tcon->use_resilient) {
> +       if (oparms->tcon->use_resilient) {
>                 /* default timeout is 0, servers pick default (120 seconds) */
>                 nr_ioctl_req.Timeout =
>                         cpu_to_le32(oparms->tcon->handle_timeout);
> --
> 2.24.1
>


-- 
Thanks,

Steve

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-12-20  1:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-18  3:04 [PATCH] cifs: Adjust indentation in smb2_open_file Nathan Chancellor
2019-12-20  1:42 ` Steve French

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).