diff mbox series

[2/4] cifs: standardize SPDX header comment

Message ID 20220722224254.8738-2-ematsumiya@suse.de (mailing list archive)
State New, archived
Headers show
Series [1/4] cifs: remove unused code | expand

Commit Message

Enzo Matsumiya July 22, 2022, 10:42 p.m. UTC
Use "//" comments for SPDX header since it seems to be most common (at
least among kernel files) than the "/* ... */" variant.

Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
---
 fs/cifs/cifs_fs_sb.h   | 2 +-
 fs/cifs/cifs_ioctl.h   | 2 +-
 fs/cifs/cifs_spnego.h  | 2 +-
 fs/cifs/cifs_swn.h     | 2 +-
 fs/cifs/cifs_unicode.h | 2 +-
 fs/cifs/cifs_uniupr.h  | 2 +-
 fs/cifs/cifsacl.h      | 2 +-
 fs/cifs/cifsfs.h       | 2 +-
 fs/cifs/cifsglob.h     | 3 +--
 fs/cifs/cifspdu.h      | 2 +-
 fs/cifs/dfs_cache.h    | 2 +-
 fs/cifs/dns_resolve.h  | 2 +-
 fs/cifs/fs_context.h   | 2 +-
 fs/cifs/fscache.h      | 2 +-
 fs/cifs/netlink.h      | 2 +-
 fs/cifs/nterr.h        | 2 +-
 fs/cifs/ntlmssp.h      | 2 +-
 fs/cifs/rfc1002pdu.h   | 2 +-
 fs/cifs/smb2glob.h     | 2 +-
 fs/cifs/smb2pdu.h      | 2 +-
 fs/cifs/smb2proto.h    | 2 +-
 fs/cifs/smb2status.h   | 2 +-
 fs/cifs/smbdirect.h    | 2 +-
 fs/cifs/smberr.h       | 2 +-
 fs/cifs/trace.h        | 2 +-
 25 files changed, 25 insertions(+), 26 deletions(-)

Comments

Steve French July 23, 2022, 3:35 a.m. UTC | #1
Interesting question whether one format is better than the other but
"// SPDX ..." is used more frequently.  In the fs directory

// SPDX ...   is used 1255 times
/* SPDX ... is used 480 times
and other are used 164 times

Is there any style recommendation on this in kernel Documentation
directory etc.?

On Fri, Jul 22, 2022 at 5:43 PM Enzo Matsumiya <ematsumiya@suse.de> wrote:
>
> Use "//" comments for SPDX header since it seems to be most common (at
> least among kernel files) than the "/* ... */" variant.
>
> Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
> ---
>  fs/cifs/cifs_fs_sb.h   | 2 +-
>  fs/cifs/cifs_ioctl.h   | 2 +-
>  fs/cifs/cifs_spnego.h  | 2 +-
>  fs/cifs/cifs_swn.h     | 2 +-
>  fs/cifs/cifs_unicode.h | 2 +-
>  fs/cifs/cifs_uniupr.h  | 2 +-
>  fs/cifs/cifsacl.h      | 2 +-
>  fs/cifs/cifsfs.h       | 2 +-
>  fs/cifs/cifsglob.h     | 3 +--
>  fs/cifs/cifspdu.h      | 2 +-
>  fs/cifs/dfs_cache.h    | 2 +-
>  fs/cifs/dns_resolve.h  | 2 +-
>  fs/cifs/fs_context.h   | 2 +-
>  fs/cifs/fscache.h      | 2 +-
>  fs/cifs/netlink.h      | 2 +-
>  fs/cifs/nterr.h        | 2 +-
>  fs/cifs/ntlmssp.h      | 2 +-
>  fs/cifs/rfc1002pdu.h   | 2 +-
>  fs/cifs/smb2glob.h     | 2 +-
>  fs/cifs/smb2pdu.h      | 2 +-
>  fs/cifs/smb2proto.h    | 2 +-
>  fs/cifs/smb2status.h   | 2 +-
>  fs/cifs/smbdirect.h    | 2 +-
>  fs/cifs/smberr.h       | 2 +-
>  fs/cifs/trace.h        | 2 +-
>  25 files changed, 25 insertions(+), 26 deletions(-)
>
> diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h
> index 013a4bd65280..7317534ac410 100644
> --- a/fs/cifs/cifs_fs_sb.h
> +++ b/fs/cifs/cifs_fs_sb.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *
>   *   Copyright (c) International Business Machines  Corp., 2002,2004
> diff --git a/fs/cifs/cifs_ioctl.h b/fs/cifs/cifs_ioctl.h
> index 03e6531998b0..bf2850b54f3b 100644
> --- a/fs/cifs/cifs_ioctl.h
> +++ b/fs/cifs/cifs_ioctl.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *
>   *   Structure definitions for io control for cifs/smb3
> diff --git a/fs/cifs/cifs_spnego.h b/fs/cifs/cifs_spnego.h
> index 7f102ffeb675..3819940e2ab5 100644
> --- a/fs/cifs/cifs_spnego.h
> +++ b/fs/cifs/cifs_spnego.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *   SPNEGO upcall management for CIFS
>   *
> diff --git a/fs/cifs/cifs_swn.h b/fs/cifs/cifs_swn.h
> index 8a9d2a5c9077..934cbd7bb3ce 100644
> --- a/fs/cifs/cifs_swn.h
> +++ b/fs/cifs/cifs_swn.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * Witness Service client for CIFS
>   *
> diff --git a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h
> index 80b3d845419f..9bad387d2bff 100644
> --- a/fs/cifs/cifs_unicode.h
> +++ b/fs/cifs/cifs_unicode.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * cifs_unicode:  Unicode kernel case support
>   *
> diff --git a/fs/cifs/cifs_uniupr.h b/fs/cifs/cifs_uniupr.h
> index 7b272fcdf0d3..529bd690fd91 100644
> --- a/fs/cifs/cifs_uniupr.h
> +++ b/fs/cifs/cifs_uniupr.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   *   Copyright (c) International Business Machines  Corp., 2000,2002
>   *
> diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h
> index f7037fd03886..6c051b3ae922 100644
> --- a/fs/cifs/cifsacl.h
> +++ b/fs/cifs/cifsacl.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *
>   *   Copyright (c) International Business Machines  Corp., 2007
> diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
> index d7f4917c191d..deef6c8d0dc3 100644
> --- a/fs/cifs/cifsfs.h
> +++ b/fs/cifs/cifsfs.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *
>   *   Copyright (c) International Business Machines  Corp., 2002, 2007
> diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
> index 721799b9a7a9..65c7e5b55278 100644
> --- a/fs/cifs/cifsglob.h
> +++ b/fs/cifs/cifsglob.h
> @@ -1,6 +1,5 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
> - *
>   *   Copyright (C) International Business Machines  Corp., 2002,2008
>   *   Author(s): Steve French (sfrench@us.ibm.com)
>   *              Jeremy Allison (jra@samba.org)
> diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h
> index d869e1ed3648..d3c5e3d23385 100644
> --- a/fs/cifs/cifspdu.h
> +++ b/fs/cifs/cifspdu.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *
>   *   Copyright (c) International Business Machines  Corp., 2002,2009
> diff --git a/fs/cifs/dfs_cache.h b/fs/cifs/dfs_cache.h
> index 52070d1df189..490aa28eec38 100644
> --- a/fs/cifs/dfs_cache.h
> +++ b/fs/cifs/dfs_cache.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * DFS referral cache routines
>   *
> diff --git a/fs/cifs/dns_resolve.h b/fs/cifs/dns_resolve.h
> index afc0df381246..5a617278a669 100644
> --- a/fs/cifs/dns_resolve.h
> +++ b/fs/cifs/dns_resolve.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *   DNS Resolver upcall management for CIFS DFS
>   *   Handles host name to IP address resolution
> diff --git a/fs/cifs/fs_context.h b/fs/cifs/fs_context.h
> index 5f093cb7e9b9..ec4a8af72570 100644
> --- a/fs/cifs/fs_context.h
> +++ b/fs/cifs/fs_context.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   *   Copyright (C) 2020, Microsoft Corporation.
>   *
> diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h
> index aa3b941a5555..435e826fdd9a 100644
> --- a/fs/cifs/fscache.h
> +++ b/fs/cifs/fscache.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *   CIFS filesystem cache interface definitions
>   *
> diff --git a/fs/cifs/netlink.h b/fs/cifs/netlink.h
> index e2fa8ed24c54..8c4e680eb41f 100644
> --- a/fs/cifs/netlink.h
> +++ b/fs/cifs/netlink.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * Netlink routines for CIFS
>   *
> diff --git a/fs/cifs/nterr.h b/fs/cifs/nterr.h
> index edd4741cab0a..0a35538dd338 100644
> --- a/fs/cifs/nterr.h
> +++ b/fs/cifs/nterr.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>     Unix SMB/Netbios implementation.
>     Version 1.9.
> diff --git a/fs/cifs/ntlmssp.h b/fs/cifs/ntlmssp.h
> index 55758b9ec877..7a00acffa6ea 100644
> --- a/fs/cifs/ntlmssp.h
> +++ b/fs/cifs/ntlmssp.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *
>   *   Copyright (c) International Business Machines  Corp., 2002,2007
> diff --git a/fs/cifs/rfc1002pdu.h b/fs/cifs/rfc1002pdu.h
> index ae1d025da294..b32940b2b2bf 100644
> --- a/fs/cifs/rfc1002pdu.h
> +++ b/fs/cifs/rfc1002pdu.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *
>   *   Protocol Data Unit definitions for RFC 1001/1002 support
> diff --git a/fs/cifs/smb2glob.h b/fs/cifs/smb2glob.h
> index 82e916ad167c..c240ce7bc0ed 100644
> --- a/fs/cifs/smb2glob.h
> +++ b/fs/cifs/smb2glob.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *
>   *   Definitions for various global variables and structures
> diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
> index 286044850e85..8cad2a5c516b 100644
> --- a/fs/cifs/smb2pdu.h
> +++ b/fs/cifs/smb2pdu.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *
>   *   Copyright (c) International Business Machines  Corp., 2009, 2013
> diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h
> index a69f1eed1cfe..c210e1221c9a 100644
> --- a/fs/cifs/smb2proto.h
> +++ b/fs/cifs/smb2proto.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *
>   *   Copyright (c) International Business Machines  Corp., 2002, 2011
> diff --git a/fs/cifs/smb2status.h b/fs/cifs/smb2status.h
> index a9e958166fc5..283bef0ae839 100644
> --- a/fs/cifs/smb2status.h
> +++ b/fs/cifs/smb2status.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *
>   *   SMB2 Status code (network error) definitions
> diff --git a/fs/cifs/smbdirect.h b/fs/cifs/smbdirect.h
> index a87fca82a796..f7b98793c664 100644
> --- a/fs/cifs/smbdirect.h
> +++ b/fs/cifs/smbdirect.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   *   Copyright (C) 2017, Microsoft Corporation.
>   *
> diff --git a/fs/cifs/smberr.h b/fs/cifs/smberr.h
> index aeffdad829e2..1d96335a046c 100644
> --- a/fs/cifs/smberr.h
> +++ b/fs/cifs/smberr.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: LGPL-2.1 */
> +// SPDX-License-Identifier: LGPL-2.1
>  /*
>   *
>   *   Copyright (c) International Business Machines  Corp., 2002,2004
> diff --git a/fs/cifs/trace.h b/fs/cifs/trace.h
> index 6b88dc2e364f..7b9a85f5b93c 100644
> --- a/fs/cifs/trace.h
> +++ b/fs/cifs/trace.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   *   Copyright (C) 2018, Microsoft Corporation.
>   *
> --
> 2.35.3
>
Enzo Matsumiya July 23, 2022, 3:46 p.m. UTC | #2
On 07/22, Steve French wrote:
>Interesting question whether one format is better than the other but
>"// SPDX ..." is used more frequently.  In the fs directory
>
>// SPDX ...   is used 1255 times
>/* SPDX ... is used 480 times
>and other are used 164 times
>
>Is there any style recommendation on this in kernel Documentation
>directory etc.?

Now that I looked it up, the recommendation [0] is to use "//" for .c
and "/* ... */" for .h, but I followed what I observed from experience.

[0] https://www.kernel.org/doc/html/v5.16/process/license-rules.html

Should I make a v2 following the official recommendation?
Enzo Matsumiya July 23, 2022, 9:01 p.m. UTC | #3
On 07/23, Steve French wrote:
>On Sat, Jul 23, 2022, 10:46 Enzo Matsumiya <ematsumiya@suse.de> wrote:
>
>> On 07/22, Steve French wrote:
>> >Interesting question whether one format is better than the other but
>> >"// SPDX ..." is used more frequently.  In the fs directory
>> >
>> >// SPDX ...   is used 1255 times
>> >/* SPDX ... is used 480 times
>> >and other are used 164 times
>> >
>> >Is there any style recommendation on this in kernel Documentation
>> >directory etc.?
>>
>> Now that I looked it up, the recommendation [0] is to use "//" for .c
>> and "/* ... */" for .h, but I followed what I observed from experience.
>>
>> [0] https://www.kernel.org/doc/html/v5.16/process/license-rules.html
>>
>> Should I make a v2 following the official recommendation?
>>
>
>Yes

Erm, apparently the whole code is according to the official
recommendations :P

So please drop this one.
diff mbox series

Patch

diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h
index 013a4bd65280..7317534ac410 100644
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/cifs/cifs_fs_sb.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *
  *   Copyright (c) International Business Machines  Corp., 2002,2004
diff --git a/fs/cifs/cifs_ioctl.h b/fs/cifs/cifs_ioctl.h
index 03e6531998b0..bf2850b54f3b 100644
--- a/fs/cifs/cifs_ioctl.h
+++ b/fs/cifs/cifs_ioctl.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *
  *   Structure definitions for io control for cifs/smb3
diff --git a/fs/cifs/cifs_spnego.h b/fs/cifs/cifs_spnego.h
index 7f102ffeb675..3819940e2ab5 100644
--- a/fs/cifs/cifs_spnego.h
+++ b/fs/cifs/cifs_spnego.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *   SPNEGO upcall management for CIFS
  *
diff --git a/fs/cifs/cifs_swn.h b/fs/cifs/cifs_swn.h
index 8a9d2a5c9077..934cbd7bb3ce 100644
--- a/fs/cifs/cifs_swn.h
+++ b/fs/cifs/cifs_swn.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: GPL-2.0 */
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Witness Service client for CIFS
  *
diff --git a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h
index 80b3d845419f..9bad387d2bff 100644
--- a/fs/cifs/cifs_unicode.h
+++ b/fs/cifs/cifs_unicode.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * cifs_unicode:  Unicode kernel case support
  *
diff --git a/fs/cifs/cifs_uniupr.h b/fs/cifs/cifs_uniupr.h
index 7b272fcdf0d3..529bd690fd91 100644
--- a/fs/cifs/cifs_uniupr.h
+++ b/fs/cifs/cifs_uniupr.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *   Copyright (c) International Business Machines  Corp., 2000,2002
  *
diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h
index f7037fd03886..6c051b3ae922 100644
--- a/fs/cifs/cifsacl.h
+++ b/fs/cifs/cifsacl.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *
  *   Copyright (c) International Business Machines  Corp., 2007
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index d7f4917c191d..deef6c8d0dc3 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *
  *   Copyright (c) International Business Machines  Corp., 2002, 2007
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 721799b9a7a9..65c7e5b55278 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -1,6 +1,5 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
- *
  *   Copyright (C) International Business Machines  Corp., 2002,2008
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *              Jeremy Allison (jra@samba.org)
diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h
index d869e1ed3648..d3c5e3d23385 100644
--- a/fs/cifs/cifspdu.h
+++ b/fs/cifs/cifspdu.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *
  *   Copyright (c) International Business Machines  Corp., 2002,2009
diff --git a/fs/cifs/dfs_cache.h b/fs/cifs/dfs_cache.h
index 52070d1df189..490aa28eec38 100644
--- a/fs/cifs/dfs_cache.h
+++ b/fs/cifs/dfs_cache.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: GPL-2.0 */
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DFS referral cache routines
  *
diff --git a/fs/cifs/dns_resolve.h b/fs/cifs/dns_resolve.h
index afc0df381246..5a617278a669 100644
--- a/fs/cifs/dns_resolve.h
+++ b/fs/cifs/dns_resolve.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *   DNS Resolver upcall management for CIFS DFS
  *   Handles host name to IP address resolution
diff --git a/fs/cifs/fs_context.h b/fs/cifs/fs_context.h
index 5f093cb7e9b9..ec4a8af72570 100644
--- a/fs/cifs/fs_context.h
+++ b/fs/cifs/fs_context.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *   Copyright (C) 2020, Microsoft Corporation.
  *
diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h
index aa3b941a5555..435e826fdd9a 100644
--- a/fs/cifs/fscache.h
+++ b/fs/cifs/fscache.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *   CIFS filesystem cache interface definitions
  *
diff --git a/fs/cifs/netlink.h b/fs/cifs/netlink.h
index e2fa8ed24c54..8c4e680eb41f 100644
--- a/fs/cifs/netlink.h
+++ b/fs/cifs/netlink.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: GPL-2.0 */
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Netlink routines for CIFS
  *
diff --git a/fs/cifs/nterr.h b/fs/cifs/nterr.h
index edd4741cab0a..0a35538dd338 100644
--- a/fs/cifs/nterr.h
+++ b/fs/cifs/nterr.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
    Unix SMB/Netbios implementation.
    Version 1.9.
diff --git a/fs/cifs/ntlmssp.h b/fs/cifs/ntlmssp.h
index 55758b9ec877..7a00acffa6ea 100644
--- a/fs/cifs/ntlmssp.h
+++ b/fs/cifs/ntlmssp.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *
  *   Copyright (c) International Business Machines  Corp., 2002,2007
diff --git a/fs/cifs/rfc1002pdu.h b/fs/cifs/rfc1002pdu.h
index ae1d025da294..b32940b2b2bf 100644
--- a/fs/cifs/rfc1002pdu.h
+++ b/fs/cifs/rfc1002pdu.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *
  *   Protocol Data Unit definitions for RFC 1001/1002 support
diff --git a/fs/cifs/smb2glob.h b/fs/cifs/smb2glob.h
index 82e916ad167c..c240ce7bc0ed 100644
--- a/fs/cifs/smb2glob.h
+++ b/fs/cifs/smb2glob.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *
  *   Definitions for various global variables and structures
diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
index 286044850e85..8cad2a5c516b 100644
--- a/fs/cifs/smb2pdu.h
+++ b/fs/cifs/smb2pdu.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *
  *   Copyright (c) International Business Machines  Corp., 2009, 2013
diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h
index a69f1eed1cfe..c210e1221c9a 100644
--- a/fs/cifs/smb2proto.h
+++ b/fs/cifs/smb2proto.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *
  *   Copyright (c) International Business Machines  Corp., 2002, 2011
diff --git a/fs/cifs/smb2status.h b/fs/cifs/smb2status.h
index a9e958166fc5..283bef0ae839 100644
--- a/fs/cifs/smb2status.h
+++ b/fs/cifs/smb2status.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *
  *   SMB2 Status code (network error) definitions
diff --git a/fs/cifs/smbdirect.h b/fs/cifs/smbdirect.h
index a87fca82a796..f7b98793c664 100644
--- a/fs/cifs/smbdirect.h
+++ b/fs/cifs/smbdirect.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *   Copyright (C) 2017, Microsoft Corporation.
  *
diff --git a/fs/cifs/smberr.h b/fs/cifs/smberr.h
index aeffdad829e2..1d96335a046c 100644
--- a/fs/cifs/smberr.h
+++ b/fs/cifs/smberr.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: LGPL-2.1 */
+// SPDX-License-Identifier: LGPL-2.1
 /*
  *
  *   Copyright (c) International Business Machines  Corp., 2002,2004
diff --git a/fs/cifs/trace.h b/fs/cifs/trace.h
index 6b88dc2e364f..7b9a85f5b93c 100644
--- a/fs/cifs/trace.h
+++ b/fs/cifs/trace.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: GPL-2.0 */
+// SPDX-License-Identifier: GPL-2.0
 /*
  *   Copyright (C) 2018, Microsoft Corporation.
  *