2020-04-25 13:39:51

by Nishad Kamdar

[permalink] [raw]
Subject: [PATCH] xfs: Use the correct style for SPDX License Identifier

This patch corrects the SPDX License Identifier style in
header files related to XFS File System support.
For C header files Documentation/process/license-rules.rst
mandates C-like comments (opposed to C source files where
C++ style should be used).

Changes made by using a script provided by Joe Perches here:
https://lkml.org/lkml/2019/2/7/46.

Suggested-by: Joe Perches <[email protected]>
Signed-off-by: Nishad Kamdar <[email protected]>
---
fs/xfs/kmem.h | 2 +-
fs/xfs/libxfs/xfs_ag_resv.h | 2 +-
fs/xfs/libxfs/xfs_alloc.h | 2 +-
fs/xfs/libxfs/xfs_alloc_btree.h | 2 +-
fs/xfs/libxfs/xfs_attr.h | 2 +-
fs/xfs/libxfs/xfs_attr_leaf.h | 2 +-
fs/xfs/libxfs/xfs_attr_remote.h | 2 +-
fs/xfs/libxfs/xfs_attr_sf.h | 2 +-
fs/xfs/libxfs/xfs_bit.h | 2 +-
fs/xfs/libxfs/xfs_bmap.h | 2 +-
fs/xfs/libxfs/xfs_bmap_btree.h | 2 +-
fs/xfs/libxfs/xfs_btree.h | 2 +-
fs/xfs/libxfs/xfs_da_btree.h | 2 +-
fs/xfs/libxfs/xfs_da_format.h | 2 +-
fs/xfs/libxfs/xfs_defer.h | 2 +-
fs/xfs/libxfs/xfs_dir2.h | 2 +-
fs/xfs/libxfs/xfs_dir2_priv.h | 2 +-
fs/xfs/libxfs/xfs_errortag.h | 2 +-
fs/xfs/libxfs/xfs_format.h | 2 +-
fs/xfs/libxfs/xfs_fs.h | 2 +-
fs/xfs/libxfs/xfs_health.h | 2 +-
fs/xfs/libxfs/xfs_ialloc.h | 2 +-
fs/xfs/libxfs/xfs_ialloc_btree.h | 2 +-
fs/xfs/libxfs/xfs_inode_buf.h | 2 +-
fs/xfs/libxfs/xfs_inode_fork.h | 2 +-
fs/xfs/libxfs/xfs_log_format.h | 2 +-
fs/xfs/libxfs/xfs_log_recover.h | 2 +-
fs/xfs/libxfs/xfs_quota_defs.h | 2 +-
fs/xfs/libxfs/xfs_refcount.h | 2 +-
fs/xfs/libxfs/xfs_refcount_btree.h | 2 +-
fs/xfs/libxfs/xfs_rmap.h | 2 +-
fs/xfs/libxfs/xfs_rmap_btree.h | 2 +-
fs/xfs/libxfs/xfs_sb.h | 2 +-
fs/xfs/libxfs/xfs_shared.h | 2 +-
fs/xfs/libxfs/xfs_trans_resv.h | 2 +-
fs/xfs/libxfs/xfs_trans_space.h | 2 +-
fs/xfs/libxfs/xfs_types.h | 2 +-
fs/xfs/mrlock.h | 2 +-
fs/xfs/scrub/bitmap.h | 2 +-
fs/xfs/scrub/btree.h | 2 +-
fs/xfs/scrub/common.h | 2 +-
fs/xfs/scrub/dabtree.h | 2 +-
fs/xfs/scrub/health.h | 2 +-
fs/xfs/scrub/repair.h | 2 +-
fs/xfs/scrub/scrub.h | 2 +-
fs/xfs/scrub/trace.h | 2 +-
fs/xfs/scrub/xfs_scrub.h | 2 +-
fs/xfs/xfs.h | 2 +-
fs/xfs/xfs_acl.h | 2 +-
fs/xfs/xfs_aops.h | 2 +-
fs/xfs/xfs_bmap_item.h | 2 +-
fs/xfs/xfs_bmap_util.h | 2 +-
fs/xfs/xfs_buf.h | 2 +-
fs/xfs/xfs_buf_item.h | 2 +-
fs/xfs/xfs_dquot.h | 2 +-
fs/xfs/xfs_dquot_item.h | 2 +-
fs/xfs/xfs_error.h | 2 +-
fs/xfs/xfs_export.h | 2 +-
fs/xfs/xfs_extent_busy.h | 2 +-
fs/xfs/xfs_extfree_item.h | 2 +-
fs/xfs/xfs_filestream.h | 2 +-
fs/xfs/xfs_fsmap.h | 2 +-
fs/xfs/xfs_fsops.h | 2 +-
fs/xfs/xfs_icache.h | 2 +-
fs/xfs/xfs_icreate_item.h | 2 +-
fs/xfs/xfs_inode.h | 2 +-
fs/xfs/xfs_inode_item.h | 2 +-
fs/xfs/xfs_ioctl.h | 2 +-
fs/xfs/xfs_ioctl32.h | 2 +-
fs/xfs/xfs_iomap.h | 2 +-
fs/xfs/xfs_iops.h | 2 +-
fs/xfs/xfs_itable.h | 2 +-
fs/xfs/xfs_linux.h | 2 +-
fs/xfs/xfs_log.h | 2 +-
fs/xfs/xfs_log_priv.h | 2 +-
fs/xfs/xfs_mount.h | 2 +-
fs/xfs/xfs_mru_cache.h | 2 +-
fs/xfs/xfs_ondisk.h | 2 +-
fs/xfs/xfs_qm.h | 2 +-
fs/xfs/xfs_quota.h | 2 +-
fs/xfs/xfs_refcount_item.h | 2 +-
fs/xfs/xfs_reflink.h | 2 +-
fs/xfs/xfs_rmap_item.h | 2 +-
fs/xfs/xfs_rtalloc.h | 2 +-
fs/xfs/xfs_stats.h | 2 +-
fs/xfs/xfs_super.h | 2 +-
fs/xfs/xfs_symlink.h | 2 +-
fs/xfs/xfs_sysctl.h | 2 +-
fs/xfs/xfs_sysfs.h | 2 +-
fs/xfs/xfs_trace.h | 2 +-
fs/xfs/xfs_trans.h | 2 +-
fs/xfs/xfs_trans_priv.h | 2 +-
92 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h
index 6143117770e9..fc87ea9f6843 100644
--- a/fs/xfs/kmem.h
+++ b/fs/xfs/kmem.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_ag_resv.h b/fs/xfs/libxfs/xfs_ag_resv.h
index c0352edc8e41..f3fd0ee9a7f7 100644
--- a/fs/xfs/libxfs/xfs_ag_resv.h
+++ b/fs/xfs/libxfs/xfs_ag_resv.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h
index a851bf77f17b..6c22b12176b8 100644
--- a/fs/xfs/libxfs/xfs_alloc.h
+++ b/fs/xfs/libxfs/xfs_alloc.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_alloc_btree.h b/fs/xfs/libxfs/xfs_alloc_btree.h
index 047f09f0be3c..a5b998e950fe 100644
--- a/fs/xfs/libxfs/xfs_alloc_btree.h
+++ b/fs/xfs/libxfs/xfs_alloc_btree.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index 0d2d05908537..db4717657ca1 100644
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2002-2003,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_attr_leaf.h b/fs/xfs/libxfs/xfs_attr_leaf.h
index 6dd2d937a42a..5be6be309302 100644
--- a/fs/xfs/libxfs/xfs_attr_leaf.h
+++ b/fs/xfs/libxfs/xfs_attr_leaf.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2002-2003,2005 Silicon Graphics, Inc.
* Copyright (c) 2013 Red Hat, Inc.
diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h
index 6fb4572845ce..e1144f22b005 100644
--- a/fs/xfs/libxfs/xfs_attr_remote.h
+++ b/fs/xfs/libxfs/xfs_attr_remote.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2013 Red Hat, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_attr_sf.h b/fs/xfs/libxfs/xfs_attr_sf.h
index aafa4fe70624..bb004fb7944a 100644
--- a/fs/xfs/libxfs/xfs_attr_sf.h
+++ b/fs/xfs/libxfs/xfs_attr_sf.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2002,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_bit.h b/fs/xfs/libxfs/xfs_bit.h
index 99017b8df292..a04f266ae644 100644
--- a/fs/xfs/libxfs/xfs_bit.h
+++ b/fs/xfs/libxfs/xfs_bit.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2002,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h
index f3259ad5c22c..6028a3c825ba 100644
--- a/fs/xfs/libxfs/xfs_bmap.h
+++ b/fs/xfs/libxfs/xfs_bmap.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2006 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_bmap_btree.h b/fs/xfs/libxfs/xfs_bmap_btree.h
index 29b407d053b4..72bf74c79fb9 100644
--- a/fs/xfs/libxfs/xfs_bmap_btree.h
+++ b/fs/xfs/libxfs/xfs_bmap_btree.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2002-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_btree.h b/fs/xfs/libxfs/xfs_btree.h
index 8626c5a81aad..10e50cbacacf 100644
--- a/fs/xfs/libxfs/xfs_btree.h
+++ b/fs/xfs/libxfs/xfs_btree.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h
index 53e503b6f186..6e25de6621e4 100644
--- a/fs/xfs/libxfs/xfs_da_btree.h
+++ b/fs/xfs/libxfs/xfs_da_btree.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2002,2005 Silicon Graphics, Inc.
* Copyright (c) 2013 Red Hat, Inc.
diff --git a/fs/xfs/libxfs/xfs_da_format.h b/fs/xfs/libxfs/xfs_da_format.h
index 08c0a4d98b89..059ac108b1b3 100644
--- a/fs/xfs/libxfs/xfs_da_format.h
+++ b/fs/xfs/libxfs/xfs_da_format.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
* Copyright (c) 2013 Red Hat, Inc.
diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h
index 7c28d7608ac6..d119f0fda166 100644
--- a/fs/xfs/libxfs/xfs_defer.h
+++ b/fs/xfs/libxfs/xfs_defer.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
index 033777e282f2..e55378640b05 100644
--- a/fs/xfs/libxfs/xfs_dir2.h
+++ b/fs/xfs/libxfs/xfs_dir2.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_dir2_priv.h b/fs/xfs/libxfs/xfs_dir2_priv.h
index 01ee0b926572..44c6a77cba05 100644
--- a/fs/xfs/libxfs/xfs_dir2_priv.h
+++ b/fs/xfs/libxfs/xfs_dir2_priv.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_errortag.h b/fs/xfs/libxfs/xfs_errortag.h
index 79e6c4fb1d8a..9c58ab8648f5 100644
--- a/fs/xfs/libxfs/xfs_errortag.h
+++ b/fs/xfs/libxfs/xfs_errortag.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
* Copyright (C) 2017 Oracle.
diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index 592f1c12ad36..f2228d9e317a 100644
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h
index 245188e4f6d3..84bcffa87753 100644
--- a/fs/xfs/libxfs/xfs_fs.h
+++ b/fs/xfs/libxfs/xfs_fs.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1
+/* SPDX-License-Identifier: LGPL-2.1 */
/*
* Copyright (c) 1995-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_health.h b/fs/xfs/libxfs/xfs_health.h
index 272005ac8c88..99e796256c5d 100644
--- a/fs/xfs/libxfs/xfs_health.h
+++ b/fs/xfs/libxfs/xfs_health.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2019 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/libxfs/xfs_ialloc.h b/fs/xfs/libxfs/xfs_ialloc.h
index 72b3468b97b1..97fe14f7224a 100644
--- a/fs/xfs/libxfs/xfs_ialloc.h
+++ b/fs/xfs/libxfs/xfs_ialloc.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.h b/fs/xfs/libxfs/xfs_ialloc_btree.h
index 35bbd978c272..68473e50fce3 100644
--- a/fs/xfs/libxfs/xfs_ialloc_btree.h
+++ b/fs/xfs/libxfs/xfs_ialloc_btree.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h
index 9b373dcf9e34..e6f81df47304 100644
--- a/fs/xfs/libxfs/xfs_inode_buf.h
+++ b/fs/xfs/libxfs/xfs_inode_buf.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h
index 668ee942be22..184f610bda35 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.h
+++ b/fs/xfs/libxfs/xfs_inode_fork.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
index e3400c9c71cd..061ea55e99ff 100644
--- a/fs/xfs/libxfs/xfs_log_format.h
+++ b/fs/xfs/libxfs/xfs_log_format.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_log_recover.h b/fs/xfs/libxfs/xfs_log_recover.h
index 3bf671637a91..8a496865c066 100644
--- a/fs/xfs/libxfs/xfs_log_recover.h
+++ b/fs/xfs/libxfs/xfs_log_recover.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_quota_defs.h b/fs/xfs/libxfs/xfs_quota_defs.h
index b2113b17e53c..44f95a55c969 100644
--- a/fs/xfs/libxfs/xfs_quota_defs.h
+++ b/fs/xfs/libxfs/xfs_quota_defs.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_refcount.h b/fs/xfs/libxfs/xfs_refcount.h
index 209795539c8d..fea2b39ffcc6 100644
--- a/fs/xfs/libxfs/xfs_refcount.h
+++ b/fs/xfs/libxfs/xfs_refcount.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/libxfs/xfs_refcount_btree.h b/fs/xfs/libxfs/xfs_refcount_btree.h
index 69dc515db671..2a3a3de25fde 100644
--- a/fs/xfs/libxfs/xfs_refcount_btree.h
+++ b/fs/xfs/libxfs/xfs_refcount_btree.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/libxfs/xfs_rmap.h b/fs/xfs/libxfs/xfs_rmap.h
index abe633403fd1..79cff528f12c 100644
--- a/fs/xfs/libxfs/xfs_rmap.h
+++ b/fs/xfs/libxfs/xfs_rmap.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/libxfs/xfs_rmap_btree.h b/fs/xfs/libxfs/xfs_rmap_btree.h
index 115c3455a734..03994234c138 100644
--- a/fs/xfs/libxfs/xfs_rmap_btree.h
+++ b/fs/xfs/libxfs/xfs_rmap_btree.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2014 Red Hat, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_sb.h b/fs/xfs/libxfs/xfs_sb.h
index 92465a9a5162..67b61ffc3a88 100644
--- a/fs/xfs/libxfs/xfs_sb.h
+++ b/fs/xfs/libxfs/xfs_sb.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_shared.h b/fs/xfs/libxfs/xfs_shared.h
index c45acbd3add9..cab93df941e4 100644
--- a/fs/xfs/libxfs/xfs_shared.h
+++ b/fs/xfs/libxfs/xfs_shared.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* Copyright (c) 2013 Red Hat, Inc.
diff --git a/fs/xfs/libxfs/xfs_trans_resv.h b/fs/xfs/libxfs/xfs_trans_resv.h
index 7241ab28cf84..2d162a45a67d 100644
--- a/fs/xfs/libxfs/xfs_trans_resv.h
+++ b/fs/xfs/libxfs/xfs_trans_resv.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_trans_space.h b/fs/xfs/libxfs/xfs_trans_space.h
index 88221c7a04cc..df7296eef2d4 100644
--- a/fs/xfs/libxfs/xfs_trans_space.h
+++ b/fs/xfs/libxfs/xfs_trans_space.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/libxfs/xfs_types.h b/fs/xfs/libxfs/xfs_types.h
index 397d94775440..b0d3d1c016c6 100644
--- a/fs/xfs/libxfs/xfs_types.h
+++ b/fs/xfs/libxfs/xfs_types.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/mrlock.h b/fs/xfs/mrlock.h
index 79155eec341b..9d48729a295e 100644
--- a/fs/xfs/mrlock.h
+++ b/fs/xfs/mrlock.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2006 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/scrub/bitmap.h b/fs/xfs/scrub/bitmap.h
index 900646b72de1..e023a5da5b59 100644
--- a/fs/xfs/scrub/bitmap.h
+++ b/fs/xfs/scrub/bitmap.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/scrub/btree.h b/fs/xfs/scrub/btree.h
index 5572e475f8ed..11a7d85d8589 100644
--- a/fs/xfs/scrub/btree.h
+++ b/fs/xfs/scrub/btree.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/scrub/common.h b/fs/xfs/scrub/common.h
index 2e50d146105d..e229ae0058d5 100644
--- a/fs/xfs/scrub/common.h
+++ b/fs/xfs/scrub/common.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/scrub/dabtree.h b/fs/xfs/scrub/dabtree.h
index 1f3515c6d5a8..930fedadbf82 100644
--- a/fs/xfs/scrub/dabtree.h
+++ b/fs/xfs/scrub/dabtree.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/scrub/health.h b/fs/xfs/scrub/health.h
index d0b938d3d028..94b361a55210 100644
--- a/fs/xfs/scrub/health.h
+++ b/fs/xfs/scrub/health.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2019 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/scrub/repair.h b/fs/xfs/scrub/repair.h
index 04a47d45605b..3654497c19f5 100644
--- a/fs/xfs/scrub/repair.h
+++ b/fs/xfs/scrub/repair.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/scrub/scrub.h b/fs/xfs/scrub/scrub.h
index ad1ceb44a628..abfae0f326f7 100644
--- a/fs/xfs/scrub/scrub.h
+++ b/fs/xfs/scrub/scrub.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/scrub/trace.h b/fs/xfs/scrub/trace.h
index e46f5cef90da..fd178a54015e 100644
--- a/fs/xfs/scrub/trace.h
+++ b/fs/xfs/scrub/trace.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/scrub/xfs_scrub.h b/fs/xfs/scrub/xfs_scrub.h
index 2897ba3a17e6..1f3277bb5258 100644
--- a/fs/xfs/scrub/xfs_scrub.h
+++ b/fs/xfs/scrub/xfs_scrub.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/xfs.h b/fs/xfs/xfs.h
index f6ffb4f248f7..d8b47f5e5949 100644
--- a/fs/xfs/xfs.h
+++ b/fs/xfs/xfs.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h
index c042c0868016..6c369d1b424f 100644
--- a/fs/xfs/xfs_acl.h
+++ b/fs/xfs/xfs_acl.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2001-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_aops.h b/fs/xfs/xfs_aops.h
index e0bd68419764..0451b9142cae 100644
--- a/fs/xfs/xfs_aops.h
+++ b/fs/xfs/xfs_aops.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2005-2006 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_bmap_item.h b/fs/xfs/xfs_bmap_item.h
index ad479cc73de8..4aa0317f759c 100644
--- a/fs/xfs/xfs_bmap_item.h
+++ b/fs/xfs/xfs_bmap_item.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/xfs_bmap_util.h b/fs/xfs/xfs_bmap_util.h
index 9f993168b55b..c3193c5777b6 100644
--- a/fs/xfs/xfs_bmap_util.h
+++ b/fs/xfs/xfs_bmap_util.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2006 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
index 9a04c53c2488..40ebad228431 100644
--- a/fs/xfs/xfs_buf.h
+++ b/fs/xfs/xfs_buf.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/xfs_buf_item.h
index 30114b510332..afd823495575 100644
--- a/fs/xfs/xfs_buf_item.h
+++ b/fs/xfs/xfs_buf_item.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h
index fe3e46df604b..303d31ad40dd 100644
--- a/fs/xfs/xfs_dquot.h
+++ b/fs/xfs/xfs_dquot.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_dquot_item.h b/fs/xfs/xfs_dquot_item.h
index 2b86a43d7ce2..69ab72056724 100644
--- a/fs/xfs/xfs_dquot_item.h
+++ b/fs/xfs/xfs_dquot_item.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2003 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h
index 1717b7508356..afefe1eed419 100644
--- a/fs/xfs/xfs_error.h
+++ b/fs/xfs/xfs_error.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_export.h b/fs/xfs/xfs_export.h
index 64471a3ddb04..5efc62f15bd0 100644
--- a/fs/xfs/xfs_export.h
+++ b/fs/xfs/xfs_export.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_extent_busy.h b/fs/xfs/xfs_extent_busy.h
index 990ab3891971..daff5522ce70 100644
--- a/fs/xfs/xfs_extent_busy.h
+++ b/fs/xfs/xfs_extent_busy.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
* Copyright (c) 2010 David Chinner.
diff --git a/fs/xfs/xfs_extfree_item.h b/fs/xfs/xfs_extfree_item.h
index 16aaab06d4ec..bc2147c43dbe 100644
--- a/fs/xfs/xfs_extfree_item.h
+++ b/fs/xfs/xfs_extfree_item.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_filestream.h b/fs/xfs/xfs_filestream.h
index 5cc7665e93c9..af23117808d0 100644
--- a/fs/xfs/xfs_filestream.h
+++ b/fs/xfs/xfs_filestream.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2006-2007 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_fsmap.h b/fs/xfs/xfs_fsmap.h
index c6c57739b862..56a4209b3a4f 100644
--- a/fs/xfs/xfs_fsmap.h
+++ b/fs/xfs/xfs_fsmap.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/xfs_fsops.h b/fs/xfs/xfs_fsops.h
index 92869f6ec8d3..6ae609e44c16 100644
--- a/fs/xfs/xfs_fsops.h
+++ b/fs/xfs/xfs_fsops.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_icache.h b/fs/xfs/xfs_icache.h
index 48f1fd2bb6ad..bb9e28d1bea6 100644
--- a/fs/xfs/xfs_icache.h
+++ b/fs/xfs/xfs_icache.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2006 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_icreate_item.h b/fs/xfs/xfs_icreate_item.h
index a50d0b01e15a..6bf905409447 100644
--- a/fs/xfs/xfs_icreate_item.h
+++ b/fs/xfs/xfs_icreate_item.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2008-2010, Dave Chinner
* All Rights Reserved.
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index c6a63f6764a6..5d1b98e53f11 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_inode_item.h b/fs/xfs/xfs_inode_item.h
index 07a60e74c39c..2c54fff9f05a 100644
--- a/fs/xfs/xfs_inode_item.h
+++ b/fs/xfs/xfs_inode_item.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_ioctl.h b/fs/xfs/xfs_ioctl.h
index bab6a5a92407..37a989521d40 100644
--- a/fs/xfs/xfs_ioctl.h
+++ b/fs/xfs/xfs_ioctl.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2008 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_ioctl32.h b/fs/xfs/xfs_ioctl32.h
index 053de7d894cd..7577f76b72c3 100644
--- a/fs/xfs/xfs_ioctl32.h
+++ b/fs/xfs/xfs_ioctl32.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2004-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_iomap.h b/fs/xfs/xfs_iomap.h
index 7d3703556d0e..8678f6cc398b 100644
--- a/fs/xfs/xfs_iomap.h
+++ b/fs/xfs/xfs_iomap.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2003-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_iops.h b/fs/xfs/xfs_iops.h
index 4d24ff309f59..4f351dfca5bb 100644
--- a/fs/xfs/xfs_iops.h
+++ b/fs/xfs/xfs_iops.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_itable.h b/fs/xfs/xfs_itable.h
index 96a1e2a9be3f..2361437cbd4d 100644
--- a/fs/xfs/xfs_itable.h
+++ b/fs/xfs/xfs_itable.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved.
*/
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
index 9f70d2f68e05..ae1e3e662690 100644
--- a/fs/xfs/xfs_linux.h
+++ b/fs/xfs/xfs_linux.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index 1412d6993f1e..3f7b51c79280 100644
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index ec22c7a3867f..0949a3a3bc81 100644
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index b2e4598fdf7d..ef02c3303afe 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_mru_cache.h b/fs/xfs/xfs_mru_cache.h
index f1fde1ecf730..afed2815ffa9 100644
--- a/fs/xfs/xfs_mru_cache.h
+++ b/fs/xfs/xfs_mru_cache.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2006-2007 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_ondisk.h b/fs/xfs/xfs_ondisk.h
index 5f04d8a5ab2a..af6e4c74ffe9 100644
--- a/fs/xfs/xfs_ondisk.h
+++ b/fs/xfs/xfs_ondisk.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2016 Oracle.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h
index 4e57edca8bce..f9c593515fc7 100644
--- a/fs/xfs/xfs_qm.h
+++ b/fs/xfs/xfs_qm.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h
index aa8fc1f55fbd..907a8ec17ec4 100644
--- a/fs/xfs/xfs_quota.h
+++ b/fs/xfs/xfs_quota.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_refcount_item.h b/fs/xfs/xfs_refcount_item.h
index e47530f30489..73d7f8134eef 100644
--- a/fs/xfs/xfs_refcount_item.h
+++ b/fs/xfs/xfs_refcount_item.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h
index 3e4fd46373ab..68f25e9ade2a 100644
--- a/fs/xfs/xfs_reflink.h
+++ b/fs/xfs/xfs_reflink.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/xfs_rmap_item.h b/fs/xfs/xfs_rmap_item.h
index 8708e4a5aa5c..da9de7662bfa 100644
--- a/fs/xfs/xfs_rmap_item.h
+++ b/fs/xfs/xfs_rmap_item.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Oracle. All Rights Reserved.
* Author: Darrick J. Wong <[email protected]>
diff --git a/fs/xfs/xfs_rtalloc.h b/fs/xfs/xfs_rtalloc.h
index 93e77b221355..47573fc80ddc 100644
--- a/fs/xfs/xfs_rtalloc.h
+++ b/fs/xfs/xfs_rtalloc.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_stats.h b/fs/xfs/xfs_stats.h
index 34d704f703d2..4c44a5725612 100644
--- a/fs/xfs/xfs_stats.h
+++ b/fs/xfs/xfs_stats.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_super.h b/fs/xfs/xfs_super.h
index b552cf6d3379..a5cd53e0277a 100644
--- a/fs/xfs/xfs_super.h
+++ b/fs/xfs/xfs_super.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_symlink.h b/fs/xfs/xfs_symlink.h
index b1fa091427e6..40052fc1e649 100644
--- a/fs/xfs/xfs_symlink.h
+++ b/fs/xfs/xfs_symlink.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2012 Red Hat, Inc. All rights reserved.
*/
diff --git a/fs/xfs/xfs_sysctl.h b/fs/xfs/xfs_sysctl.h
index 8abf4640f1d5..c1a59e5a81ca 100644
--- a/fs/xfs/xfs_sysctl.h
+++ b/fs/xfs/xfs_sysctl.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2001-2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_sysfs.h b/fs/xfs/xfs_sysfs.h
index e9f810fc6731..56676cd7fe8b 100644
--- a/fs/xfs/xfs_sysfs.h
+++ b/fs/xfs/xfs_sysfs.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2014 Red Hat, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index a4323a63438d..ecb0036c9436 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2009, Christoph Hellwig
* All Rights Reserved.
diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
index 752c7fef9de7..e127e7d0bf67 100644
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
* All Rights Reserved.
diff --git a/fs/xfs/xfs_trans_priv.h b/fs/xfs/xfs_trans_priv.h
index 35655eac01a6..0005021f7f6a 100644
--- a/fs/xfs/xfs_trans_priv.h
+++ b/fs/xfs/xfs_trans_priv.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2000,2002,2005 Silicon Graphics, Inc.
* All Rights Reserved.
--
2.17.1


2020-04-27 07:29:14

by Christoph Hellwig

[permalink] [raw]
Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier

On Sat, Apr 25, 2020 at 07:05:09PM +0530, Nishad Kamdar wrote:
> This patch corrects the SPDX License Identifier style in
> header files related to XFS File System support.
> For C header files Documentation/process/license-rules.rst
> mandates C-like comments (opposed to C source files where
> C++ style should be used).
>
> Changes made by using a script provided by Joe Perches here:
> https://lkml.org/lkml/2019/2/7/46.

Please use up all 73 chars in your commit logs.

2020-04-27 15:59:17

by Darrick J. Wong

[permalink] [raw]
Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier

On Sat, Apr 25, 2020 at 07:05:09PM +0530, Nishad Kamdar wrote:
> This patch corrects the SPDX License Identifier style in
> header files related to XFS File System support.
> For C header files Documentation/process/license-rules.rst
> mandates C-like comments (opposed to C source files where
> C++ style should be used).
>
> Changes made by using a script provided by Joe Perches here:
> https://lkml.org/lkml/2019/2/7/46.
>
> Suggested-by: Joe Perches <[email protected]>
> Signed-off-by: Nishad Kamdar <[email protected]>
> ---
> fs/xfs/kmem.h | 2 +-
> fs/xfs/libxfs/xfs_ag_resv.h | 2 +-
> fs/xfs/libxfs/xfs_alloc.h | 2 +-
> fs/xfs/libxfs/xfs_alloc_btree.h | 2 +-
> fs/xfs/libxfs/xfs_attr.h | 2 +-
> fs/xfs/libxfs/xfs_attr_leaf.h | 2 +-
> fs/xfs/libxfs/xfs_attr_remote.h | 2 +-
> fs/xfs/libxfs/xfs_attr_sf.h | 2 +-
> fs/xfs/libxfs/xfs_bit.h | 2 +-
> fs/xfs/libxfs/xfs_bmap.h | 2 +-
> fs/xfs/libxfs/xfs_bmap_btree.h | 2 +-
> fs/xfs/libxfs/xfs_btree.h | 2 +-
> fs/xfs/libxfs/xfs_da_btree.h | 2 +-
> fs/xfs/libxfs/xfs_da_format.h | 2 +-
> fs/xfs/libxfs/xfs_defer.h | 2 +-
> fs/xfs/libxfs/xfs_dir2.h | 2 +-
> fs/xfs/libxfs/xfs_dir2_priv.h | 2 +-
> fs/xfs/libxfs/xfs_errortag.h | 2 +-
> fs/xfs/libxfs/xfs_format.h | 2 +-
> fs/xfs/libxfs/xfs_fs.h | 2 +-
> fs/xfs/libxfs/xfs_health.h | 2 +-
> fs/xfs/libxfs/xfs_ialloc.h | 2 +-
> fs/xfs/libxfs/xfs_ialloc_btree.h | 2 +-
> fs/xfs/libxfs/xfs_inode_buf.h | 2 +-
> fs/xfs/libxfs/xfs_inode_fork.h | 2 +-
> fs/xfs/libxfs/xfs_log_format.h | 2 +-
> fs/xfs/libxfs/xfs_log_recover.h | 2 +-
> fs/xfs/libxfs/xfs_quota_defs.h | 2 +-
> fs/xfs/libxfs/xfs_refcount.h | 2 +-
> fs/xfs/libxfs/xfs_refcount_btree.h | 2 +-
> fs/xfs/libxfs/xfs_rmap.h | 2 +-
> fs/xfs/libxfs/xfs_rmap_btree.h | 2 +-
> fs/xfs/libxfs/xfs_sb.h | 2 +-
> fs/xfs/libxfs/xfs_shared.h | 2 +-
> fs/xfs/libxfs/xfs_trans_resv.h | 2 +-
> fs/xfs/libxfs/xfs_trans_space.h | 2 +-
> fs/xfs/libxfs/xfs_types.h | 2 +-
> fs/xfs/mrlock.h | 2 +-
> fs/xfs/scrub/bitmap.h | 2 +-
> fs/xfs/scrub/btree.h | 2 +-
> fs/xfs/scrub/common.h | 2 +-
> fs/xfs/scrub/dabtree.h | 2 +-
> fs/xfs/scrub/health.h | 2 +-
> fs/xfs/scrub/repair.h | 2 +-
> fs/xfs/scrub/scrub.h | 2 +-
> fs/xfs/scrub/trace.h | 2 +-
> fs/xfs/scrub/xfs_scrub.h | 2 +-
> fs/xfs/xfs.h | 2 +-
> fs/xfs/xfs_acl.h | 2 +-
> fs/xfs/xfs_aops.h | 2 +-
> fs/xfs/xfs_bmap_item.h | 2 +-
> fs/xfs/xfs_bmap_util.h | 2 +-
> fs/xfs/xfs_buf.h | 2 +-
> fs/xfs/xfs_buf_item.h | 2 +-
> fs/xfs/xfs_dquot.h | 2 +-
> fs/xfs/xfs_dquot_item.h | 2 +-
> fs/xfs/xfs_error.h | 2 +-
> fs/xfs/xfs_export.h | 2 +-
> fs/xfs/xfs_extent_busy.h | 2 +-
> fs/xfs/xfs_extfree_item.h | 2 +-
> fs/xfs/xfs_filestream.h | 2 +-
> fs/xfs/xfs_fsmap.h | 2 +-
> fs/xfs/xfs_fsops.h | 2 +-
> fs/xfs/xfs_icache.h | 2 +-
> fs/xfs/xfs_icreate_item.h | 2 +-
> fs/xfs/xfs_inode.h | 2 +-
> fs/xfs/xfs_inode_item.h | 2 +-
> fs/xfs/xfs_ioctl.h | 2 +-
> fs/xfs/xfs_ioctl32.h | 2 +-
> fs/xfs/xfs_iomap.h | 2 +-
> fs/xfs/xfs_iops.h | 2 +-
> fs/xfs/xfs_itable.h | 2 +-
> fs/xfs/xfs_linux.h | 2 +-
> fs/xfs/xfs_log.h | 2 +-
> fs/xfs/xfs_log_priv.h | 2 +-
> fs/xfs/xfs_mount.h | 2 +-
> fs/xfs/xfs_mru_cache.h | 2 +-
> fs/xfs/xfs_ondisk.h | 2 +-
> fs/xfs/xfs_qm.h | 2 +-
> fs/xfs/xfs_quota.h | 2 +-
> fs/xfs/xfs_refcount_item.h | 2 +-
> fs/xfs/xfs_reflink.h | 2 +-
> fs/xfs/xfs_rmap_item.h | 2 +-
> fs/xfs/xfs_rtalloc.h | 2 +-
> fs/xfs/xfs_stats.h | 2 +-
> fs/xfs/xfs_super.h | 2 +-
> fs/xfs/xfs_symlink.h | 2 +-
> fs/xfs/xfs_sysctl.h | 2 +-
> fs/xfs/xfs_sysfs.h | 2 +-
> fs/xfs/xfs_trace.h | 2 +-
> fs/xfs/xfs_trans.h | 2 +-
> fs/xfs/xfs_trans_priv.h | 2 +-
> 92 files changed, 92 insertions(+), 92 deletions(-)
>
> diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h
> index 6143117770e9..fc87ea9f6843 100644
> --- a/fs/xfs/kmem.h
> +++ b/fs/xfs/kmem.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_ag_resv.h b/fs/xfs/libxfs/xfs_ag_resv.h
> index c0352edc8e41..f3fd0ee9a7f7 100644
> --- a/fs/xfs/libxfs/xfs_ag_resv.h
> +++ b/fs/xfs/libxfs/xfs_ag_resv.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */

I thought we were supposed to use 'GPL-2.0-or-newer' because 'GPL-2.0+'
is deprecated in some newer version of the SPDX standard?

<shrug>

--D

> /*
> * Copyright (C) 2016 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h
> index a851bf77f17b..6c22b12176b8 100644
> --- a/fs/xfs/libxfs/xfs_alloc.h
> +++ b/fs/xfs/libxfs/xfs_alloc.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_alloc_btree.h b/fs/xfs/libxfs/xfs_alloc_btree.h
> index 047f09f0be3c..a5b998e950fe 100644
> --- a/fs/xfs/libxfs/xfs_alloc_btree.h
> +++ b/fs/xfs/libxfs/xfs_alloc_btree.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
> index 0d2d05908537..db4717657ca1 100644
> --- a/fs/xfs/libxfs/xfs_attr.h
> +++ b/fs/xfs/libxfs/xfs_attr.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2002-2003,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.h b/fs/xfs/libxfs/xfs_attr_leaf.h
> index 6dd2d937a42a..5be6be309302 100644
> --- a/fs/xfs/libxfs/xfs_attr_leaf.h
> +++ b/fs/xfs/libxfs/xfs_attr_leaf.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2002-2003,2005 Silicon Graphics, Inc.
> * Copyright (c) 2013 Red Hat, Inc.
> diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h
> index 6fb4572845ce..e1144f22b005 100644
> --- a/fs/xfs/libxfs/xfs_attr_remote.h
> +++ b/fs/xfs/libxfs/xfs_attr_remote.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2013 Red Hat, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_attr_sf.h b/fs/xfs/libxfs/xfs_attr_sf.h
> index aafa4fe70624..bb004fb7944a 100644
> --- a/fs/xfs/libxfs/xfs_attr_sf.h
> +++ b/fs/xfs/libxfs/xfs_attr_sf.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2002,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_bit.h b/fs/xfs/libxfs/xfs_bit.h
> index 99017b8df292..a04f266ae644 100644
> --- a/fs/xfs/libxfs/xfs_bit.h
> +++ b/fs/xfs/libxfs/xfs_bit.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2002,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h
> index f3259ad5c22c..6028a3c825ba 100644
> --- a/fs/xfs/libxfs/xfs_bmap.h
> +++ b/fs/xfs/libxfs/xfs_bmap.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2006 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_bmap_btree.h b/fs/xfs/libxfs/xfs_bmap_btree.h
> index 29b407d053b4..72bf74c79fb9 100644
> --- a/fs/xfs/libxfs/xfs_bmap_btree.h
> +++ b/fs/xfs/libxfs/xfs_bmap_btree.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2002-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_btree.h b/fs/xfs/libxfs/xfs_btree.h
> index 8626c5a81aad..10e50cbacacf 100644
> --- a/fs/xfs/libxfs/xfs_btree.h
> +++ b/fs/xfs/libxfs/xfs_btree.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h
> index 53e503b6f186..6e25de6621e4 100644
> --- a/fs/xfs/libxfs/xfs_da_btree.h
> +++ b/fs/xfs/libxfs/xfs_da_btree.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2002,2005 Silicon Graphics, Inc.
> * Copyright (c) 2013 Red Hat, Inc.
> diff --git a/fs/xfs/libxfs/xfs_da_format.h b/fs/xfs/libxfs/xfs_da_format.h
> index 08c0a4d98b89..059ac108b1b3 100644
> --- a/fs/xfs/libxfs/xfs_da_format.h
> +++ b/fs/xfs/libxfs/xfs_da_format.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
> * Copyright (c) 2013 Red Hat, Inc.
> diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h
> index 7c28d7608ac6..d119f0fda166 100644
> --- a/fs/xfs/libxfs/xfs_defer.h
> +++ b/fs/xfs/libxfs/xfs_defer.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2016 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
> index 033777e282f2..e55378640b05 100644
> --- a/fs/xfs/libxfs/xfs_dir2.h
> +++ b/fs/xfs/libxfs/xfs_dir2.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_dir2_priv.h b/fs/xfs/libxfs/xfs_dir2_priv.h
> index 01ee0b926572..44c6a77cba05 100644
> --- a/fs/xfs/libxfs/xfs_dir2_priv.h
> +++ b/fs/xfs/libxfs/xfs_dir2_priv.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_errortag.h b/fs/xfs/libxfs/xfs_errortag.h
> index 79e6c4fb1d8a..9c58ab8648f5 100644
> --- a/fs/xfs/libxfs/xfs_errortag.h
> +++ b/fs/xfs/libxfs/xfs_errortag.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
> * Copyright (C) 2017 Oracle.
> diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
> index 592f1c12ad36..f2228d9e317a 100644
> --- a/fs/xfs/libxfs/xfs_format.h
> +++ b/fs/xfs/libxfs/xfs_format.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h
> index 245188e4f6d3..84bcffa87753 100644
> --- a/fs/xfs/libxfs/xfs_fs.h
> +++ b/fs/xfs/libxfs/xfs_fs.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: LGPL-2.1
> +/* SPDX-License-Identifier: LGPL-2.1 */
> /*
> * Copyright (c) 1995-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_health.h b/fs/xfs/libxfs/xfs_health.h
> index 272005ac8c88..99e796256c5d 100644
> --- a/fs/xfs/libxfs/xfs_health.h
> +++ b/fs/xfs/libxfs/xfs_health.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2019 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/libxfs/xfs_ialloc.h b/fs/xfs/libxfs/xfs_ialloc.h
> index 72b3468b97b1..97fe14f7224a 100644
> --- a/fs/xfs/libxfs/xfs_ialloc.h
> +++ b/fs/xfs/libxfs/xfs_ialloc.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.h b/fs/xfs/libxfs/xfs_ialloc_btree.h
> index 35bbd978c272..68473e50fce3 100644
> --- a/fs/xfs/libxfs/xfs_ialloc_btree.h
> +++ b/fs/xfs/libxfs/xfs_ialloc_btree.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h
> index 9b373dcf9e34..e6f81df47304 100644
> --- a/fs/xfs/libxfs/xfs_inode_buf.h
> +++ b/fs/xfs/libxfs/xfs_inode_buf.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h
> index 668ee942be22..184f610bda35 100644
> --- a/fs/xfs/libxfs/xfs_inode_fork.h
> +++ b/fs/xfs/libxfs/xfs_inode_fork.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
> index e3400c9c71cd..061ea55e99ff 100644
> --- a/fs/xfs/libxfs/xfs_log_format.h
> +++ b/fs/xfs/libxfs/xfs_log_format.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_log_recover.h b/fs/xfs/libxfs/xfs_log_recover.h
> index 3bf671637a91..8a496865c066 100644
> --- a/fs/xfs/libxfs/xfs_log_recover.h
> +++ b/fs/xfs/libxfs/xfs_log_recover.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_quota_defs.h b/fs/xfs/libxfs/xfs_quota_defs.h
> index b2113b17e53c..44f95a55c969 100644
> --- a/fs/xfs/libxfs/xfs_quota_defs.h
> +++ b/fs/xfs/libxfs/xfs_quota_defs.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_refcount.h b/fs/xfs/libxfs/xfs_refcount.h
> index 209795539c8d..fea2b39ffcc6 100644
> --- a/fs/xfs/libxfs/xfs_refcount.h
> +++ b/fs/xfs/libxfs/xfs_refcount.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2016 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/libxfs/xfs_refcount_btree.h b/fs/xfs/libxfs/xfs_refcount_btree.h
> index 69dc515db671..2a3a3de25fde 100644
> --- a/fs/xfs/libxfs/xfs_refcount_btree.h
> +++ b/fs/xfs/libxfs/xfs_refcount_btree.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2016 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/libxfs/xfs_rmap.h b/fs/xfs/libxfs/xfs_rmap.h
> index abe633403fd1..79cff528f12c 100644
> --- a/fs/xfs/libxfs/xfs_rmap.h
> +++ b/fs/xfs/libxfs/xfs_rmap.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2016 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/libxfs/xfs_rmap_btree.h b/fs/xfs/libxfs/xfs_rmap_btree.h
> index 115c3455a734..03994234c138 100644
> --- a/fs/xfs/libxfs/xfs_rmap_btree.h
> +++ b/fs/xfs/libxfs/xfs_rmap_btree.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2014 Red Hat, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_sb.h b/fs/xfs/libxfs/xfs_sb.h
> index 92465a9a5162..67b61ffc3a88 100644
> --- a/fs/xfs/libxfs/xfs_sb.h
> +++ b/fs/xfs/libxfs/xfs_sb.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_shared.h b/fs/xfs/libxfs/xfs_shared.h
> index c45acbd3add9..cab93df941e4 100644
> --- a/fs/xfs/libxfs/xfs_shared.h
> +++ b/fs/xfs/libxfs/xfs_shared.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> * Copyright (c) 2013 Red Hat, Inc.
> diff --git a/fs/xfs/libxfs/xfs_trans_resv.h b/fs/xfs/libxfs/xfs_trans_resv.h
> index 7241ab28cf84..2d162a45a67d 100644
> --- a/fs/xfs/libxfs/xfs_trans_resv.h
> +++ b/fs/xfs/libxfs/xfs_trans_resv.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_trans_space.h b/fs/xfs/libxfs/xfs_trans_space.h
> index 88221c7a04cc..df7296eef2d4 100644
> --- a/fs/xfs/libxfs/xfs_trans_space.h
> +++ b/fs/xfs/libxfs/xfs_trans_space.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/libxfs/xfs_types.h b/fs/xfs/libxfs/xfs_types.h
> index 397d94775440..b0d3d1c016c6 100644
> --- a/fs/xfs/libxfs/xfs_types.h
> +++ b/fs/xfs/libxfs/xfs_types.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/mrlock.h b/fs/xfs/mrlock.h
> index 79155eec341b..9d48729a295e 100644
> --- a/fs/xfs/mrlock.h
> +++ b/fs/xfs/mrlock.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2006 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/scrub/bitmap.h b/fs/xfs/scrub/bitmap.h
> index 900646b72de1..e023a5da5b59 100644
> --- a/fs/xfs/scrub/bitmap.h
> +++ b/fs/xfs/scrub/bitmap.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2018 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/scrub/btree.h b/fs/xfs/scrub/btree.h
> index 5572e475f8ed..11a7d85d8589 100644
> --- a/fs/xfs/scrub/btree.h
> +++ b/fs/xfs/scrub/btree.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2017 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/scrub/common.h b/fs/xfs/scrub/common.h
> index 2e50d146105d..e229ae0058d5 100644
> --- a/fs/xfs/scrub/common.h
> +++ b/fs/xfs/scrub/common.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2017 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/scrub/dabtree.h b/fs/xfs/scrub/dabtree.h
> index 1f3515c6d5a8..930fedadbf82 100644
> --- a/fs/xfs/scrub/dabtree.h
> +++ b/fs/xfs/scrub/dabtree.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2017 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/scrub/health.h b/fs/xfs/scrub/health.h
> index d0b938d3d028..94b361a55210 100644
> --- a/fs/xfs/scrub/health.h
> +++ b/fs/xfs/scrub/health.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2019 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/scrub/repair.h b/fs/xfs/scrub/repair.h
> index 04a47d45605b..3654497c19f5 100644
> --- a/fs/xfs/scrub/repair.h
> +++ b/fs/xfs/scrub/repair.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2018 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/scrub/scrub.h b/fs/xfs/scrub/scrub.h
> index ad1ceb44a628..abfae0f326f7 100644
> --- a/fs/xfs/scrub/scrub.h
> +++ b/fs/xfs/scrub/scrub.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2017 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/scrub/trace.h b/fs/xfs/scrub/trace.h
> index e46f5cef90da..fd178a54015e 100644
> --- a/fs/xfs/scrub/trace.h
> +++ b/fs/xfs/scrub/trace.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2017 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/scrub/xfs_scrub.h b/fs/xfs/scrub/xfs_scrub.h
> index 2897ba3a17e6..1f3277bb5258 100644
> --- a/fs/xfs/scrub/xfs_scrub.h
> +++ b/fs/xfs/scrub/xfs_scrub.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2017 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/xfs.h b/fs/xfs/xfs.h
> index f6ffb4f248f7..d8b47f5e5949 100644
> --- a/fs/xfs/xfs.h
> +++ b/fs/xfs/xfs.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h
> index c042c0868016..6c369d1b424f 100644
> --- a/fs/xfs/xfs_acl.h
> +++ b/fs/xfs/xfs_acl.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2001-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_aops.h b/fs/xfs/xfs_aops.h
> index e0bd68419764..0451b9142cae 100644
> --- a/fs/xfs/xfs_aops.h
> +++ b/fs/xfs/xfs_aops.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2005-2006 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_bmap_item.h b/fs/xfs/xfs_bmap_item.h
> index ad479cc73de8..4aa0317f759c 100644
> --- a/fs/xfs/xfs_bmap_item.h
> +++ b/fs/xfs/xfs_bmap_item.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2016 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/xfs_bmap_util.h b/fs/xfs/xfs_bmap_util.h
> index 9f993168b55b..c3193c5777b6 100644
> --- a/fs/xfs/xfs_bmap_util.h
> +++ b/fs/xfs/xfs_bmap_util.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2006 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
> index 9a04c53c2488..40ebad228431 100644
> --- a/fs/xfs/xfs_buf.h
> +++ b/fs/xfs/xfs_buf.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/xfs_buf_item.h
> index 30114b510332..afd823495575 100644
> --- a/fs/xfs/xfs_buf_item.h
> +++ b/fs/xfs/xfs_buf_item.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h
> index fe3e46df604b..303d31ad40dd 100644
> --- a/fs/xfs/xfs_dquot.h
> +++ b/fs/xfs/xfs_dquot.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_dquot_item.h b/fs/xfs/xfs_dquot_item.h
> index 2b86a43d7ce2..69ab72056724 100644
> --- a/fs/xfs/xfs_dquot_item.h
> +++ b/fs/xfs/xfs_dquot_item.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2003 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h
> index 1717b7508356..afefe1eed419 100644
> --- a/fs/xfs/xfs_error.h
> +++ b/fs/xfs/xfs_error.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_export.h b/fs/xfs/xfs_export.h
> index 64471a3ddb04..5efc62f15bd0 100644
> --- a/fs/xfs/xfs_export.h
> +++ b/fs/xfs/xfs_export.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_extent_busy.h b/fs/xfs/xfs_extent_busy.h
> index 990ab3891971..daff5522ce70 100644
> --- a/fs/xfs/xfs_extent_busy.h
> +++ b/fs/xfs/xfs_extent_busy.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
> * Copyright (c) 2010 David Chinner.
> diff --git a/fs/xfs/xfs_extfree_item.h b/fs/xfs/xfs_extfree_item.h
> index 16aaab06d4ec..bc2147c43dbe 100644
> --- a/fs/xfs/xfs_extfree_item.h
> +++ b/fs/xfs/xfs_extfree_item.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_filestream.h b/fs/xfs/xfs_filestream.h
> index 5cc7665e93c9..af23117808d0 100644
> --- a/fs/xfs/xfs_filestream.h
> +++ b/fs/xfs/xfs_filestream.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2006-2007 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_fsmap.h b/fs/xfs/xfs_fsmap.h
> index c6c57739b862..56a4209b3a4f 100644
> --- a/fs/xfs/xfs_fsmap.h
> +++ b/fs/xfs/xfs_fsmap.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2017 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/xfs_fsops.h b/fs/xfs/xfs_fsops.h
> index 92869f6ec8d3..6ae609e44c16 100644
> --- a/fs/xfs/xfs_fsops.h
> +++ b/fs/xfs/xfs_fsops.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_icache.h b/fs/xfs/xfs_icache.h
> index 48f1fd2bb6ad..bb9e28d1bea6 100644
> --- a/fs/xfs/xfs_icache.h
> +++ b/fs/xfs/xfs_icache.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2006 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_icreate_item.h b/fs/xfs/xfs_icreate_item.h
> index a50d0b01e15a..6bf905409447 100644
> --- a/fs/xfs/xfs_icreate_item.h
> +++ b/fs/xfs/xfs_icreate_item.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2008-2010, Dave Chinner
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
> index c6a63f6764a6..5d1b98e53f11 100644
> --- a/fs/xfs/xfs_inode.h
> +++ b/fs/xfs/xfs_inode.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_inode_item.h b/fs/xfs/xfs_inode_item.h
> index 07a60e74c39c..2c54fff9f05a 100644
> --- a/fs/xfs/xfs_inode_item.h
> +++ b/fs/xfs/xfs_inode_item.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_ioctl.h b/fs/xfs/xfs_ioctl.h
> index bab6a5a92407..37a989521d40 100644
> --- a/fs/xfs/xfs_ioctl.h
> +++ b/fs/xfs/xfs_ioctl.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2008 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_ioctl32.h b/fs/xfs/xfs_ioctl32.h
> index 053de7d894cd..7577f76b72c3 100644
> --- a/fs/xfs/xfs_ioctl32.h
> +++ b/fs/xfs/xfs_ioctl32.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2004-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_iomap.h b/fs/xfs/xfs_iomap.h
> index 7d3703556d0e..8678f6cc398b 100644
> --- a/fs/xfs/xfs_iomap.h
> +++ b/fs/xfs/xfs_iomap.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2003-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_iops.h b/fs/xfs/xfs_iops.h
> index 4d24ff309f59..4f351dfca5bb 100644
> --- a/fs/xfs/xfs_iops.h
> +++ b/fs/xfs/xfs_iops.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_itable.h b/fs/xfs/xfs_itable.h
> index 96a1e2a9be3f..2361437cbd4d 100644
> --- a/fs/xfs/xfs_itable.h
> +++ b/fs/xfs/xfs_itable.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved.
> */
> diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
> index 9f70d2f68e05..ae1e3e662690 100644
> --- a/fs/xfs/xfs_linux.h
> +++ b/fs/xfs/xfs_linux.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
> index 1412d6993f1e..3f7b51c79280 100644
> --- a/fs/xfs/xfs_log.h
> +++ b/fs/xfs/xfs_log.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
> index ec22c7a3867f..0949a3a3bc81 100644
> --- a/fs/xfs/xfs_log_priv.h
> +++ b/fs/xfs/xfs_log_priv.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
> index b2e4598fdf7d..ef02c3303afe 100644
> --- a/fs/xfs/xfs_mount.h
> +++ b/fs/xfs/xfs_mount.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_mru_cache.h b/fs/xfs/xfs_mru_cache.h
> index f1fde1ecf730..afed2815ffa9 100644
> --- a/fs/xfs/xfs_mru_cache.h
> +++ b/fs/xfs/xfs_mru_cache.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2006-2007 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_ondisk.h b/fs/xfs/xfs_ondisk.h
> index 5f04d8a5ab2a..af6e4c74ffe9 100644
> --- a/fs/xfs/xfs_ondisk.h
> +++ b/fs/xfs/xfs_ondisk.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2016 Oracle.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h
> index 4e57edca8bce..f9c593515fc7 100644
> --- a/fs/xfs/xfs_qm.h
> +++ b/fs/xfs/xfs_qm.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h
> index aa8fc1f55fbd..907a8ec17ec4 100644
> --- a/fs/xfs/xfs_quota.h
> +++ b/fs/xfs/xfs_quota.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_refcount_item.h b/fs/xfs/xfs_refcount_item.h
> index e47530f30489..73d7f8134eef 100644
> --- a/fs/xfs/xfs_refcount_item.h
> +++ b/fs/xfs/xfs_refcount_item.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2016 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h
> index 3e4fd46373ab..68f25e9ade2a 100644
> --- a/fs/xfs/xfs_reflink.h
> +++ b/fs/xfs/xfs_reflink.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2016 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/xfs_rmap_item.h b/fs/xfs/xfs_rmap_item.h
> index 8708e4a5aa5c..da9de7662bfa 100644
> --- a/fs/xfs/xfs_rmap_item.h
> +++ b/fs/xfs/xfs_rmap_item.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Copyright (C) 2016 Oracle. All Rights Reserved.
> * Author: Darrick J. Wong <[email protected]>
> diff --git a/fs/xfs/xfs_rtalloc.h b/fs/xfs/xfs_rtalloc.h
> index 93e77b221355..47573fc80ddc 100644
> --- a/fs/xfs/xfs_rtalloc.h
> +++ b/fs/xfs/xfs_rtalloc.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_stats.h b/fs/xfs/xfs_stats.h
> index 34d704f703d2..4c44a5725612 100644
> --- a/fs/xfs/xfs_stats.h
> +++ b/fs/xfs/xfs_stats.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_super.h b/fs/xfs/xfs_super.h
> index b552cf6d3379..a5cd53e0277a 100644
> --- a/fs/xfs/xfs_super.h
> +++ b/fs/xfs/xfs_super.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_symlink.h b/fs/xfs/xfs_symlink.h
> index b1fa091427e6..40052fc1e649 100644
> --- a/fs/xfs/xfs_symlink.h
> +++ b/fs/xfs/xfs_symlink.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2012 Red Hat, Inc. All rights reserved.
> */
> diff --git a/fs/xfs/xfs_sysctl.h b/fs/xfs/xfs_sysctl.h
> index 8abf4640f1d5..c1a59e5a81ca 100644
> --- a/fs/xfs/xfs_sysctl.h
> +++ b/fs/xfs/xfs_sysctl.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2001-2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_sysfs.h b/fs/xfs/xfs_sysfs.h
> index e9f810fc6731..56676cd7fe8b 100644
> --- a/fs/xfs/xfs_sysfs.h
> +++ b/fs/xfs/xfs_sysfs.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2014 Red Hat, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index a4323a63438d..ecb0036c9436 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2009, Christoph Hellwig
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
> index 752c7fef9de7..e127e7d0bf67 100644
> --- a/fs/xfs/xfs_trans.h
> +++ b/fs/xfs/xfs_trans.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> diff --git a/fs/xfs/xfs_trans_priv.h b/fs/xfs/xfs_trans_priv.h
> index 35655eac01a6..0005021f7f6a 100644
> --- a/fs/xfs/xfs_trans_priv.h
> +++ b/fs/xfs/xfs_trans_priv.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (c) 2000,2002,2005 Silicon Graphics, Inc.
> * All Rights Reserved.
> --
> 2.17.1
>

2020-04-27 17:32:17

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier

On Mon, Apr 27, 2020 at 08:56:18AM -0700, Darrick J. Wong wrote:
> On Sat, Apr 25, 2020 at 07:05:09PM +0530, Nishad Kamdar wrote:
> > This patch corrects the SPDX License Identifier style in
> > header files related to XFS File System support.
> > For C header files Documentation/process/license-rules.rst
> > mandates C-like comments (opposed to C source files where
> > C++ style should be used).
> >
> > Changes made by using a script provided by Joe Perches here:
> > https://lkml.org/lkml/2019/2/7/46.
> >
> > Suggested-by: Joe Perches <[email protected]>
> > Signed-off-by: Nishad Kamdar <[email protected]>
> > ---
> > fs/xfs/kmem.h | 2 +-
> > fs/xfs/libxfs/xfs_ag_resv.h | 2 +-
> > fs/xfs/libxfs/xfs_alloc.h | 2 +-
> > fs/xfs/libxfs/xfs_alloc_btree.h | 2 +-
> > fs/xfs/libxfs/xfs_attr.h | 2 +-
> > fs/xfs/libxfs/xfs_attr_leaf.h | 2 +-
> > fs/xfs/libxfs/xfs_attr_remote.h | 2 +-
> > fs/xfs/libxfs/xfs_attr_sf.h | 2 +-
> > fs/xfs/libxfs/xfs_bit.h | 2 +-
> > fs/xfs/libxfs/xfs_bmap.h | 2 +-
> > fs/xfs/libxfs/xfs_bmap_btree.h | 2 +-
> > fs/xfs/libxfs/xfs_btree.h | 2 +-
> > fs/xfs/libxfs/xfs_da_btree.h | 2 +-
> > fs/xfs/libxfs/xfs_da_format.h | 2 +-
> > fs/xfs/libxfs/xfs_defer.h | 2 +-
> > fs/xfs/libxfs/xfs_dir2.h | 2 +-
> > fs/xfs/libxfs/xfs_dir2_priv.h | 2 +-
> > fs/xfs/libxfs/xfs_errortag.h | 2 +-
> > fs/xfs/libxfs/xfs_format.h | 2 +-
> > fs/xfs/libxfs/xfs_fs.h | 2 +-
> > fs/xfs/libxfs/xfs_health.h | 2 +-
> > fs/xfs/libxfs/xfs_ialloc.h | 2 +-
> > fs/xfs/libxfs/xfs_ialloc_btree.h | 2 +-
> > fs/xfs/libxfs/xfs_inode_buf.h | 2 +-
> > fs/xfs/libxfs/xfs_inode_fork.h | 2 +-
> > fs/xfs/libxfs/xfs_log_format.h | 2 +-
> > fs/xfs/libxfs/xfs_log_recover.h | 2 +-
> > fs/xfs/libxfs/xfs_quota_defs.h | 2 +-
> > fs/xfs/libxfs/xfs_refcount.h | 2 +-
> > fs/xfs/libxfs/xfs_refcount_btree.h | 2 +-
> > fs/xfs/libxfs/xfs_rmap.h | 2 +-
> > fs/xfs/libxfs/xfs_rmap_btree.h | 2 +-
> > fs/xfs/libxfs/xfs_sb.h | 2 +-
> > fs/xfs/libxfs/xfs_shared.h | 2 +-
> > fs/xfs/libxfs/xfs_trans_resv.h | 2 +-
> > fs/xfs/libxfs/xfs_trans_space.h | 2 +-
> > fs/xfs/libxfs/xfs_types.h | 2 +-
> > fs/xfs/mrlock.h | 2 +-
> > fs/xfs/scrub/bitmap.h | 2 +-
> > fs/xfs/scrub/btree.h | 2 +-
> > fs/xfs/scrub/common.h | 2 +-
> > fs/xfs/scrub/dabtree.h | 2 +-
> > fs/xfs/scrub/health.h | 2 +-
> > fs/xfs/scrub/repair.h | 2 +-
> > fs/xfs/scrub/scrub.h | 2 +-
> > fs/xfs/scrub/trace.h | 2 +-
> > fs/xfs/scrub/xfs_scrub.h | 2 +-
> > fs/xfs/xfs.h | 2 +-
> > fs/xfs/xfs_acl.h | 2 +-
> > fs/xfs/xfs_aops.h | 2 +-
> > fs/xfs/xfs_bmap_item.h | 2 +-
> > fs/xfs/xfs_bmap_util.h | 2 +-
> > fs/xfs/xfs_buf.h | 2 +-
> > fs/xfs/xfs_buf_item.h | 2 +-
> > fs/xfs/xfs_dquot.h | 2 +-
> > fs/xfs/xfs_dquot_item.h | 2 +-
> > fs/xfs/xfs_error.h | 2 +-
> > fs/xfs/xfs_export.h | 2 +-
> > fs/xfs/xfs_extent_busy.h | 2 +-
> > fs/xfs/xfs_extfree_item.h | 2 +-
> > fs/xfs/xfs_filestream.h | 2 +-
> > fs/xfs/xfs_fsmap.h | 2 +-
> > fs/xfs/xfs_fsops.h | 2 +-
> > fs/xfs/xfs_icache.h | 2 +-
> > fs/xfs/xfs_icreate_item.h | 2 +-
> > fs/xfs/xfs_inode.h | 2 +-
> > fs/xfs/xfs_inode_item.h | 2 +-
> > fs/xfs/xfs_ioctl.h | 2 +-
> > fs/xfs/xfs_ioctl32.h | 2 +-
> > fs/xfs/xfs_iomap.h | 2 +-
> > fs/xfs/xfs_iops.h | 2 +-
> > fs/xfs/xfs_itable.h | 2 +-
> > fs/xfs/xfs_linux.h | 2 +-
> > fs/xfs/xfs_log.h | 2 +-
> > fs/xfs/xfs_log_priv.h | 2 +-
> > fs/xfs/xfs_mount.h | 2 +-
> > fs/xfs/xfs_mru_cache.h | 2 +-
> > fs/xfs/xfs_ondisk.h | 2 +-
> > fs/xfs/xfs_qm.h | 2 +-
> > fs/xfs/xfs_quota.h | 2 +-
> > fs/xfs/xfs_refcount_item.h | 2 +-
> > fs/xfs/xfs_reflink.h | 2 +-
> > fs/xfs/xfs_rmap_item.h | 2 +-
> > fs/xfs/xfs_rtalloc.h | 2 +-
> > fs/xfs/xfs_stats.h | 2 +-
> > fs/xfs/xfs_super.h | 2 +-
> > fs/xfs/xfs_symlink.h | 2 +-
> > fs/xfs/xfs_sysctl.h | 2 +-
> > fs/xfs/xfs_sysfs.h | 2 +-
> > fs/xfs/xfs_trace.h | 2 +-
> > fs/xfs/xfs_trans.h | 2 +-
> > fs/xfs/xfs_trans_priv.h | 2 +-
> > 92 files changed, 92 insertions(+), 92 deletions(-)
> >
> > diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h
> > index 6143117770e9..fc87ea9f6843 100644
> > --- a/fs/xfs/kmem.h
> > +++ b/fs/xfs/kmem.h
> > @@ -1,4 +1,4 @@
> > -// SPDX-License-Identifier: GPL-2.0
> > +/* SPDX-License-Identifier: GPL-2.0 */
> > /*
> > * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> > * All Rights Reserved.
> > diff --git a/fs/xfs/libxfs/xfs_ag_resv.h b/fs/xfs/libxfs/xfs_ag_resv.h
> > index c0352edc8e41..f3fd0ee9a7f7 100644
> > --- a/fs/xfs/libxfs/xfs_ag_resv.h
> > +++ b/fs/xfs/libxfs/xfs_ag_resv.h
> > @@ -1,4 +1,4 @@
> > -// SPDX-License-Identifier: GPL-2.0+
> > +/* SPDX-License-Identifier: GPL-2.0+ */
>
> I thought we were supposed to use 'GPL-2.0-or-newer' because 'GPL-2.0+'
> is deprecated in some newer version of the SPDX standard?
>
> <shrug>

The kernel follows the "older" SPDX standard, but will accept either,
it's up to the author. It is all documented in LICENSES/ if people
really want to make sure.

thanks,

greg k-h

2020-04-27 17:43:50

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier

On Mon, 2020-04-27 at 19:29 +0200, Greg Kroah-Hartman wrote:
> On Mon, Apr 27, 2020 at 08:56:18AM -0700, Darrick J. Wong wrote:
> > On Sat, Apr 25, 2020 at 07:05:09PM +0530, Nishad Kamdar wrote:
> > > This patch corrects the SPDX License Identifier style in
> > > header files related to XFS File System support.
> > > For C header files Documentation/process/license-rules.rst
> > > mandates C-like comments (opposed to C source files where
> > > C++ style should be used).
> > >
> > > Changes made by using a script provided by Joe Perches here:
> > > https://lkml.org/lkml/2019/2/7/46.
[]
> > > diff --git a/fs/xfs/libxfs/xfs_ag_resv.h b/fs/xfs/libxfs/xfs_ag_resv.h
[]
> > > @@ -1,4 +1,4 @@
> > > -// SPDX-License-Identifier: GPL-2.0+
> > > +/* SPDX-License-Identifier: GPL-2.0+ */
> >
> > I thought we were supposed to use 'GPL-2.0-or-newer' because 'GPL-2.0+'
> > is deprecated in some newer version of the SPDX standard?
> >
> > <shrug>
>
> The kernel follows the "older" SPDX standard, but will accept either,
> it's up to the author. It is all documented in LICENSES/ if people
> really want to make sure.

I think the kernel should prefer the "newer" SPDX standard
for any/all changes to these lines.
---
LICENSES/preferred/GPL-2.0 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/LICENSES/preferred/GPL-2.0 b/LICENSES/preferred/GPL-2.0
index ff0812..c50f93 100644
--- a/LICENSES/preferred/GPL-2.0
+++ b/LICENSES/preferred/GPL-2.0
@@ -8,13 +8,13 @@ Usage-Guide:
tag/value pairs into a comment according to the placement
guidelines in the licensing rules documentation.
For 'GNU General Public License (GPL) version 2 only' use:
- SPDX-License-Identifier: GPL-2.0
- or
SPDX-License-Identifier: GPL-2.0-only
+ or the deprecated alternative
+ SPDX-License-Identifier: GPL-2.0
For 'GNU General Public License (GPL) version 2 or any later version' use:
- SPDX-License-Identifier: GPL-2.0+
- or
SPDX-License-Identifier: GPL-2.0-or-later
+ or the deprecated alternative
+ SPDX-License-Identifier: GPL-2.0+
License-Text:

GNU GENERAL PUBLIC LICENSE


2020-04-27 17:49:22

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier

On Mon, Apr 27, 2020 at 10:41:58AM -0700, Joe Perches wrote:
> On Mon, 2020-04-27 at 19:29 +0200, Greg Kroah-Hartman wrote:
> > On Mon, Apr 27, 2020 at 08:56:18AM -0700, Darrick J. Wong wrote:
> > > On Sat, Apr 25, 2020 at 07:05:09PM +0530, Nishad Kamdar wrote:
> > > > This patch corrects the SPDX License Identifier style in
> > > > header files related to XFS File System support.
> > > > For C header files Documentation/process/license-rules.rst
> > > > mandates C-like comments (opposed to C source files where
> > > > C++ style should be used).
> > > >
> > > > Changes made by using a script provided by Joe Perches here:
> > > > https://lkml.org/lkml/2019/2/7/46.
> []
> > > > diff --git a/fs/xfs/libxfs/xfs_ag_resv.h b/fs/xfs/libxfs/xfs_ag_resv.h
> []
> > > > @@ -1,4 +1,4 @@
> > > > -// SPDX-License-Identifier: GPL-2.0+
> > > > +/* SPDX-License-Identifier: GPL-2.0+ */
> > >
> > > I thought we were supposed to use 'GPL-2.0-or-newer' because 'GPL-2.0+'
> > > is deprecated in some newer version of the SPDX standard?
> > >
> > > <shrug>
> >
> > The kernel follows the "older" SPDX standard, but will accept either,
> > it's up to the author. It is all documented in LICENSES/ if people
> > really want to make sure.
>
> I think the kernel should prefer the "newer" SPDX standard
> for any/all changes to these lines.
> ---
> LICENSES/preferred/GPL-2.0 | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/LICENSES/preferred/GPL-2.0 b/LICENSES/preferred/GPL-2.0
> index ff0812..c50f93 100644
> --- a/LICENSES/preferred/GPL-2.0
> +++ b/LICENSES/preferred/GPL-2.0
> @@ -8,13 +8,13 @@ Usage-Guide:
> tag/value pairs into a comment according to the placement
> guidelines in the licensing rules documentation.
> For 'GNU General Public License (GPL) version 2 only' use:
> - SPDX-License-Identifier: GPL-2.0
> - or
> SPDX-License-Identifier: GPL-2.0-only
> + or the deprecated alternative
> + SPDX-License-Identifier: GPL-2.0
> For 'GNU General Public License (GPL) version 2 or any later version' use:
> - SPDX-License-Identifier: GPL-2.0+
> - or
> SPDX-License-Identifier: GPL-2.0-or-later
> + or the deprecated alternative
> + SPDX-License-Identifier: GPL-2.0+
> License-Text:

At the moment, I do not, as the current ones are not "depreciated" at
all.

thanks,

greg k-h

2020-04-27 18:06:07

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier

On Mon, 2020-04-27 at 19:46 +0200, Greg Kroah-Hartman wrote:
> On Mon, Apr 27, 2020 at 10:41:58AM -0700, Joe Perches wrote:
> > On Mon, 2020-04-27 at 19:29 +0200, Greg Kroah-Hartman wrote:
> > > On Mon, Apr 27, 2020 at 08:56:18AM -0700, Darrick J. Wong wrote:
> > > > On Sat, Apr 25, 2020 at 07:05:09PM +0530, Nishad Kamdar wrote:
> > > > > This patch corrects the SPDX License Identifier style in
> > > > > header files related to XFS File System support.
> > > > > For C header files Documentation/process/license-rules.rst
> > > > > mandates C-like comments (opposed to C source files where
> > > > > C++ style should be used).
> > > > >
> > > > > Changes made by using a script provided by Joe Perches here:
> > > > > https://lkml.org/lkml/2019/2/7/46.
> > []
> > > > > diff --git a/fs/xfs/libxfs/xfs_ag_resv.h b/fs/xfs/libxfs/xfs_ag_resv.h
> > []
> > > > > @@ -1,4 +1,4 @@
> > > > > -// SPDX-License-Identifier: GPL-2.0+
> > > > > +/* SPDX-License-Identifier: GPL-2.0+ */
> > > >
> > > > I thought we were supposed to use 'GPL-2.0-or-newer' because 'GPL-2.0+'
> > > > is deprecated in some newer version of the SPDX standard?
> > > >
> > > > <shrug>
> > >
> > > The kernel follows the "older" SPDX standard, but will accept either,
> > > it's up to the author. It is all documented in LICENSES/ if people
> > > really want to make sure.
> >
> > I think the kernel should prefer the "newer" SPDX standard
> > for any/all changes to these lines.
> > ---
> > LICENSES/preferred/GPL-2.0 | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/LICENSES/preferred/GPL-2.0 b/LICENSES/preferred/GPL-2.0
> > index ff0812..c50f93 100644
> > --- a/LICENSES/preferred/GPL-2.0
> > +++ b/LICENSES/preferred/GPL-2.0
> > @@ -8,13 +8,13 @@ Usage-Guide:
> > tag/value pairs into a comment according to the placement
> > guidelines in the licensing rules documentation.
> > For 'GNU General Public License (GPL) version 2 only' use:
> > - SPDX-License-Identifier: GPL-2.0
> > - or
> > SPDX-License-Identifier: GPL-2.0-only
> > + or the deprecated alternative
> > + SPDX-License-Identifier: GPL-2.0
> > For 'GNU General Public License (GPL) version 2 or any later version' use:
> > - SPDX-License-Identifier: GPL-2.0+
> > - or
> > SPDX-License-Identifier: GPL-2.0-or-later
> > + or the deprecated alternative
> > + SPDX-License-Identifier: GPL-2.0+
> > License-Text:
>
> At the moment, I do not, as the current ones are not "depreciated" at
> all.

https://spdx.org/licenses/

shows the GPL-2.0 and GPL-2.0+ as deprecated.

https://spdx.org/licenses/GPL-2.0.html
https://spdx.org/licenses/GPL-2.0+.html

2020-04-27 18:40:20

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier

On Mon, Apr 27, 2020 at 11:01:38AM -0700, Joe Perches wrote:
> On Mon, 2020-04-27 at 19:46 +0200, Greg Kroah-Hartman wrote:
> > On Mon, Apr 27, 2020 at 10:41:58AM -0700, Joe Perches wrote:
> > > On Mon, 2020-04-27 at 19:29 +0200, Greg Kroah-Hartman wrote:
> > > > On Mon, Apr 27, 2020 at 08:56:18AM -0700, Darrick J. Wong wrote:
> > > > > On Sat, Apr 25, 2020 at 07:05:09PM +0530, Nishad Kamdar wrote:
> > > > > > This patch corrects the SPDX License Identifier style in
> > > > > > header files related to XFS File System support.
> > > > > > For C header files Documentation/process/license-rules.rst
> > > > > > mandates C-like comments (opposed to C source files where
> > > > > > C++ style should be used).
> > > > > >
> > > > > > Changes made by using a script provided by Joe Perches here:
> > > > > > https://lkml.org/lkml/2019/2/7/46.
> > > []
> > > > > > diff --git a/fs/xfs/libxfs/xfs_ag_resv.h b/fs/xfs/libxfs/xfs_ag_resv.h
> > > []
> > > > > > @@ -1,4 +1,4 @@
> > > > > > -// SPDX-License-Identifier: GPL-2.0+
> > > > > > +/* SPDX-License-Identifier: GPL-2.0+ */
> > > > >
> > > > > I thought we were supposed to use 'GPL-2.0-or-newer' because 'GPL-2.0+'
> > > > > is deprecated in some newer version of the SPDX standard?
> > > > >
> > > > > <shrug>
> > > >
> > > > The kernel follows the "older" SPDX standard, but will accept either,
> > > > it's up to the author. It is all documented in LICENSES/ if people
> > > > really want to make sure.
> > >
> > > I think the kernel should prefer the "newer" SPDX standard
> > > for any/all changes to these lines.
> > > ---
> > > LICENSES/preferred/GPL-2.0 | 8 ++++----
> > > 1 file changed, 4 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/LICENSES/preferred/GPL-2.0 b/LICENSES/preferred/GPL-2.0
> > > index ff0812..c50f93 100644
> > > --- a/LICENSES/preferred/GPL-2.0
> > > +++ b/LICENSES/preferred/GPL-2.0
> > > @@ -8,13 +8,13 @@ Usage-Guide:
> > > tag/value pairs into a comment according to the placement
> > > guidelines in the licensing rules documentation.
> > > For 'GNU General Public License (GPL) version 2 only' use:
> > > - SPDX-License-Identifier: GPL-2.0
> > > - or
> > > SPDX-License-Identifier: GPL-2.0-only
> > > + or the deprecated alternative
> > > + SPDX-License-Identifier: GPL-2.0
> > > For 'GNU General Public License (GPL) version 2 or any later version' use:
> > > - SPDX-License-Identifier: GPL-2.0+
> > > - or
> > > SPDX-License-Identifier: GPL-2.0-or-later
> > > + or the deprecated alternative
> > > + SPDX-License-Identifier: GPL-2.0+
> > > License-Text:
> >
> > At the moment, I do not, as the current ones are not "depreciated" at
> > all.
>
> https://spdx.org/licenses/
>
> shows the GPL-2.0 and GPL-2.0+ as deprecated.
>
> https://spdx.org/licenses/GPL-2.0.html
> https://spdx.org/licenses/GPL-2.0+.html
>

Again, we are not using the "new" version of the SPDX specification just
yet. We started out using one specific version, let's get the whole
kernel converted first before worrying about trying to keep up with
their newer releases please. We still have a ways to go...

thanks,

greg k-h

2020-04-27 19:01:48

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier

On Mon, 2020-04-27 at 20:36 +0200, Greg Kroah-Hartman wrote:
> On Mon, Apr 27, 2020 at 11:01:38AM -0700, Joe Perches wrote:
> > On Mon, 2020-04-27 at 19:46 +0200, Greg Kroah-Hartman wrote:
> > > On Mon, Apr 27, 2020 at 10:41:58AM -0700, Joe Perches wrote:
> > > > On Mon, 2020-04-27 at 19:29 +0200, Greg Kroah-Hartman wrote:
[]
> > > > > I thought we were supposed to use 'GPL-2.0-or-newer' because 'GPL-2.0+'
> > > > > > is deprecated in some newer version of the SPDX standard?
> > > > > >
> > > > > > <shrug>
> > > > >
> > > > > The kernel follows the "older" SPDX standard, but will accept either,
> > > > > it's up to the author. It is all documented in LICENSES/ if people
> > > > > really want to make sure.
> > > >
> > > > I think the kernel should prefer the "newer" SPDX standard
> > > > for any/all changes to these lines.
> > > > ---
> > > > LICENSES/preferred/GPL-2.0 | 8 ++++----
> > > > 1 file changed, 4 insertions(+), 4 deletions(-)
> > > >
> > > > diff --git a/LICENSES/preferred/GPL-2.0 b/LICENSES/preferred/GPL-2.0
> > > > index ff0812..c50f93 100644
> > > > --- a/LICENSES/preferred/GPL-2.0
> > > > +++ b/LICENSES/preferred/GPL-2.0
> > > > @@ -8,13 +8,13 @@ Usage-Guide:
> > > > tag/value pairs into a comment according to the placement
> > > > guidelines in the licensing rules documentation.
> > > > For 'GNU General Public License (GPL) version 2 only' use:
> > > > - SPDX-License-Identifier: GPL-2.0
> > > > - or
> > > > SPDX-License-Identifier: GPL-2.0-only
> > > > + or the deprecated alternative
> > > > + SPDX-License-Identifier: GPL-2.0
> > > > For 'GNU General Public License (GPL) version 2 or any later version' use:
> > > > - SPDX-License-Identifier: GPL-2.0+
> > > > - or
> > > > SPDX-License-Identifier: GPL-2.0-or-later
> > > > + or the deprecated alternative
> > > > + SPDX-License-Identifier: GPL-2.0+
> > > > License-Text:
> > >
> > > At the moment, I do not, as the current ones are not "depreciated" at
> > > all.
> >
> > https://spdx.org/licenses/
> >
> > shows the GPL-2.0 and GPL-2.0+ as deprecated.
> >
> > https://spdx.org/licenses/GPL-2.0.html
> > https://spdx.org/licenses/GPL-2.0+.html
> >
>
> Again, we are not using the "new" version of the SPDX specification just
> yet. We started out using one specific version, let's get the whole
> kernel converted first before worrying about trying to keep up with
> their newer releases please. We still have a ways to go...

It seems you refer to yourself using the majestic plural.

There's already ~80% use of SPDX-License-Identifier and the
-only versions are already about 25% of the existing uses.

There's no real reason not to prefer the latest versions
over the deprecated ones.


2020-04-27 19:43:34

by Linus Torvalds

[permalink] [raw]
Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier

On Mon, Apr 27, 2020 at 11:59 AM Joe Perches <[email protected]> wrote:
>
> There's no real reason not to prefer the latest versions
> over the deprecated ones.

Joe, your pedantic approach is really hard to work with. Please work on it.

The fact is, there *is * a reason to avoid the pedantic "change to new
version" - pointless churn.

We have a lot of the original style spdx markers, because those are
what we started with. And changing them is pointless.

I know you love your scripts to change things around, but to everybody
else it tends to be just extra work and noise.

Linus

2020-04-27 20:40:55

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier

On Mon, 2020-04-27 at 12:40 -0700, Linus Torvalds wrote:
> On Mon, Apr 27, 2020 at 11:59 AM Joe Perches <[email protected]> wrote:
> > There's no real reason not to prefer the latest versions
> > over the deprecated ones.
>
> Joe, your pedantic approach is really hard to work with. Please work on it.

License text especially _should_ be pedantic and precise.

> The fact is, there *is * a reason to avoid the pedantic "change to new
> version" - pointless churn.

Have you *looked* at this proposed change?

It just changes // SPDX comments to /* */ in .h files.

It's generically useless churn as using the // style in .h files
was only for old and now unsupported compiler versions.

> We have a lot of the original style spdx markers, because those are
> what we started with. And changing them is pointless.

You and I (and apparently the SPDX group too as they deprecated it)
disagree a bit here.

> I know you love your scripts to change things around, but to everybody
> else it tends to be just extra work and noise.

Piecemeal changes aren't great.

Scripted changes can be very useful and I believe they
are significantly underutilized in this source tree.

cheers, Joe

2020-04-27 20:49:03

by Linus Torvalds

[permalink] [raw]
Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier

On Mon, Apr 27, 2020 at 1:39 PM Joe Perches <[email protected]> wrote:
>
> > The fact is, there *is * a reason to avoid the pedantic "change to new
> > version" - pointless churn.
>
> Have you *looked* at this proposed change?
>
> It just changes // SPDX comments to /* */ in .h files.

That's not what I was reacting to - it was you arguing with Greg about
how we use the legacy format.

I really don't care at all about the comment character choices
(either), but wanted to point out that as far as the kernel is
concerned, the "deprecated" spdx keys simply arent' deprecated, they
are just as valid.

> Piecemeal changes aren't great.

Piecemeal changes are fine, when the change doesn't have to be done AT ALL.

There is simply no point in EVER changing "GPL-2.0" into
"GPL-2.0-only" etc, unless the thing is then touched for some other
reason (which it may never be).

Scripted changes are not as useful as you think. They often cause
unnecessary noise in other respects.

I'm constantly seeing stupid pointless work due to irrelevant patches
that then show up in "get_maintainer" output because they show up as
changes to drivbers that nobody cares about.

Or "git blame -C" things that I have to ignore and go past that
history because the scripted change showed an (uninteresting) change.

The fact is, pointless churn is BAD. It's a real expense. The whole
"get it over with once" argument is simply completely wrong.

There are real advantages to "don't touch stuff that doesn't actively
need touching".

Linus

2020-04-29 00:22:50

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier

On Mon, 2020-04-27 at 13:46 -0700, Linus Torvalds wrote:
> There is simply no point in EVER changing "GPL-2.0" into
> "GPL-2.0-only" etc, unless the thing is then touched for some other
> reason (which it may never be).

Which is _exactly_ what is happening here.

But the reason _not_ to touch it here is there would
be a difference between the SPDX license text in the
.c and .h files in the directory.


2020-05-02 09:02:16

by Nishad Kamdar

[permalink] [raw]
Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier

On Mon, Apr 27, 2020 at 12:25:27AM -0700, Christoph Hellwig wrote:
> On Sat, Apr 25, 2020 at 07:05:09PM +0530, Nishad Kamdar wrote:
> > This patch corrects the SPDX License Identifier style in
> > header files related to XFS File System support.
> > For C header files Documentation/process/license-rules.rst
> > mandates C-like comments (opposed to C source files where
> > C++ style should be used).
> >
> > Changes made by using a script provided by Joe Perches here:
> > https://lkml.org/lkml/2019/2/7/46.
>
> Please use up all 73 chars in your commit logs.

Ok, I'll do that.

Thanks for the review.

Regards,
Nishad