xfs_scrub: fix author and spdx headers on scrub/ files

Fix the spdx tags to match current practice, and update the author
contact information.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/scrub/common.c b/scrub/common.c
index 49a87f412c4dcf65753d37ca73e6f679da5dc4f1..25a398c5fe43940580aead7a00f4bcd2558f0fa1 100644 (file)
--- a/scrub/common.c
+++ b/scrub/common.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <pthread.h>

diff --git a/scrub/common.h b/scrub/common.h
index 13b5f309955c7accff4a1c6a373730e59b570d40..26ef7c861c6ec8538dc1e82a2b0cd1350a4d1c86 100644 (file)
--- a/scrub/common.h
+++ b/scrub/common.h
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_COMMON_H_
 #define XFS_SCRUB_COMMON_H_

diff --git a/scrub/counter.c b/scrub/counter.c
index 6d91eb6e015fe570e3082a02a408d6c73a6b701e..b63ec721c3491daa5e4a96a2f2f3c94c87c75ef6 100644 (file)
--- a/scrub/counter.c
+++ b/scrub/counter.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/counter.h b/scrub/counter.h
index 01b65056a2ecba94712b26659aa68b34d7b77d20..77e380cc6112b1aeeeca1b1095f3618494fb28b8 100644 (file)
--- a/scrub/counter.h
+++ b/scrub/counter.h
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_COUNTER_H_
 #define XFS_SCRUB_COUNTER_H_

diff --git a/scrub/descr.c b/scrub/descr.c
index e694d01d7b74d8224ffe7e34dd50de1f956e4da0..bf0c5717a115cf0ad85a5afa79f3c3c116bd7955 100644 (file)
--- a/scrub/descr.c
+++ b/scrub/descr.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2019 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <assert.h>

diff --git a/scrub/descr.h b/scrub/descr.h
index f1899b67206a77e6e71bbe56bd152fb870bb336a..0f5d9067e5df42a89f54425709ce2e518c50408a 100644 (file)
--- a/scrub/descr.h
+++ b/scrub/descr.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C) 2019 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_DESCR_H_
 #define XFS_SCRUB_DESCR_H_

diff --git a/scrub/disk.c b/scrub/disk.c
index a1ef798a02540fad7880c90a6699b12eefa24ff1..740a7ac962f5e6487bc7e8f468b3d52ff520e9e9 100644 (file)
--- a/scrub/disk.c
+++ b/scrub/disk.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/disk.h b/scrub/disk.h
index 36bfb8263d1015bd66a95ae88e518fb4f07d2951..1f6c73aee3d7ea251e5e8d439a048dc364351d61 100644 (file)
--- a/scrub/disk.h
+++ b/scrub/disk.h
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_DISK_H_
 #define XFS_SCRUB_DISK_H_

diff --git a/scrub/filemap.c b/scrub/filemap.c
index d4905ace659edb6dcae2b2b02ae9dd6a28c105df..c1e520299edf86c46840699db9eb7f60148522a0 100644 (file)
--- a/scrub/filemap.c
+++ b/scrub/filemap.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/filemap.h b/scrub/filemap.h
index 133e860bb82676f15252369fb061423b5144369c..d123537aaff1139af430143bb68df92806c931b7 100644 (file)
--- a/scrub/filemap.h
+++ b/scrub/filemap.h
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_FILEMAP_H_
 #define XFS_SCRUB_FILEMAP_H_

diff --git a/scrub/fscounters.c b/scrub/fscounters.c
index 3ceae3715dca6d4f7abd73a97d058842c4f9cf38..6df0533a0b72a2a600643a774e4de2f22251d3ce 100644 (file)
--- a/scrub/fscounters.c
+++ b/scrub/fscounters.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/fscounters.h b/scrub/fscounters.h
index 13bd9967f004a4311647bd12a22fc769eeb4a2a2..fb0923afe70d6bdd3b7eebb511cd0d3942396792 100644 (file)
--- a/scrub/fscounters.h
+++ b/scrub/fscounters.h
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_FSCOUNTERS_H_
 #define XFS_SCRUB_FSCOUNTERS_H_

diff --git a/scrub/inodes.c b/scrub/inodes.c
index 78f0914b8d91b95150cfbca231120e96b386501c..d937915312d0e92d97bf9870e9a7db655404ce3b 100644 (file)
--- a/scrub/inodes.c
+++ b/scrub/inodes.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/inodes.h b/scrub/inodes.h
index f03180458ab924b6e53f03d061190e96e60b51ee..40e1291d15e5f074997b10748f5f1f4d9e7cc1a3 100644 (file)
--- a/scrub/inodes.h
+++ b/scrub/inodes.h
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_INODES_H_
 #define XFS_SCRUB_INODES_H_

diff --git a/scrub/phase1.c b/scrub/phase1.c
index 2daf5c7bb389213a2ec55d962049611c2b8a338c..9e838fad91f50f68060a7e90b1d6bf76bb18dab5 100644 (file)
--- a/scrub/phase1.c
+++ b/scrub/phase1.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <unistd.h>

diff --git a/scrub/phase2.c b/scrub/phase2.c
index 8f82e2a6c0445a2e37b74dbdc4281cd31d59950f..48c9f589f7c1d952310aba9b610b60e0ebcf34f2 100644 (file)
--- a/scrub/phase2.c
+++ b/scrub/phase2.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/phase3.c b/scrub/phase3.c
index 65e903f23d2c8d606b553fad34ae1986c831c9f7..98742e0b72f1d8f64f573e3d5e629222b02581e6 100644 (file)
--- a/scrub/phase3.c
+++ b/scrub/phase3.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/phase4.c b/scrub/phase4.c
index ecd56056ca289f90273190ee964824c073e00742..a67abd76a1712c5f2f062c6ad3d7424f253cfa77 100644 (file)
--- a/scrub/phase4.c
+++ b/scrub/phase4.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/phase5.c b/scrub/phase5.c
index 31405709657755c1dd889b4161e38be3b9e25db9..4cf56ee591a4f478ae1bb9e925798af96a63182c 100644 (file)
--- a/scrub/phase5.c
+++ b/scrub/phase5.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/phase6.c b/scrub/phase6.c
index afdb16b689cc84693aa0a8ecf8931f7e1aaef9bc..e2de20c63c44de16c45d9896519d91555c10d2d0 100644 (file)
--- a/scrub/phase6.c
+++ b/scrub/phase6.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/phase7.c b/scrub/phase7.c
index 8d8034c36afb68c0d085346c4b99a9ee68703ca7..fe928d79eae3ec678b88554152dae305c39b2fdc 100644 (file)
--- a/scrub/phase7.c
+++ b/scrub/phase7.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/progress.c b/scrub/progress.c
index a3d096f98e2c8548d9583aebd4f476ce30d9215e..ffbf3ef3676bb0d9cf0614d4fa07dcdffc7ddeeb 100644 (file)
--- a/scrub/progress.c
+++ b/scrub/progress.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <dirent.h>

diff --git a/scrub/progress.h b/scrub/progress.h
index c1a115cbe8062a563fa0e94ce30a79cd9c1bae36..561695e2ac2bf34c202ab212c730e557a9d41bf9 100644 (file)
--- a/scrub/progress.h
+++ b/scrub/progress.h
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_PROGRESS_H_
 #define XFS_SCRUB_PROGRESS_H_

diff --git a/scrub/read_verify.c b/scrub/read_verify.c
index be30f2688f99dbd34646e37396a2b4414a7b2af7..435f54e2a84e5c1e3ee7dafe5c02fa76f0ea9bbc 100644 (file)
--- a/scrub/read_verify.c
+++ b/scrub/read_verify.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/read_verify.h b/scrub/read_verify.h
index 650c46d447b6126846a63adc007baa4f23f0735b..66f098954b6419a2a083ad030555acbcf2a8dc76 100644 (file)
--- a/scrub/read_verify.h
+++ b/scrub/read_verify.h
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_READ_VERIFY_H_
 #define XFS_SCRUB_READ_VERIFY_H_

diff --git a/scrub/repair.c b/scrub/repair.c
index 5fc5ab836c7e51dfd8ef749833fa71ccdc3a2008..107aa25a016655f0fdd8f84d3c94ea904d311048 100644 (file)
--- a/scrub/repair.c
+++ b/scrub/repair.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/repair.h b/scrub/repair.h
index 102e5779c700eb7ce04f5709271ab005c38e9137..b67c1ac95e62231ad8a936344fd4d8be9b4236b6 100644 (file)
--- a/scrub/repair.h
+++ b/scrub/repair.h
@@ -1,7 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_REPAIR_H_
 #define XFS_SCRUB_REPAIR_H_

diff --git a/scrub/scrub.c b/scrub/scrub.c
index 1469058bd23efd8767ce191d0d65840a348d44a0..376dc1a1625bb3d1936377da710980563ccec7db 100644 (file)
--- a/scrub/scrub.c
+++ b/scrub/scrub.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/scrub.h b/scrub/scrub.h
index 023069ee066f41b397be22d68ca2e5ae2ed0d94f..b3e2742a17bf85d86dad0c814301dc666026f6dc 100644 (file)
--- a/scrub/scrub.h
+++ b/scrub/scrub.h
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_SCRUB_H_
 #define XFS_SCRUB_SCRUB_H_

diff --git a/scrub/spacemap.c b/scrub/spacemap.c
index 03440d3a85486b4b9cec09356322b86653f606e0..d0adae6780c2f8e96abd63502824e2e9928efdbc 100644 (file)
--- a/scrub/spacemap.c
+++ b/scrub/spacemap.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/spacemap.h b/scrub/spacemap.h
index 8a6d1e361580bc7c5eb33dad79a59c7c66b1cfa6..787f4652fa2ab63caf6f05bbc2b3e3ed7ce1b9bf 100644 (file)
--- a/scrub/spacemap.h
+++ b/scrub/spacemap.h
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_SPACEMAP_H_
 #define XFS_SCRUB_SPACEMAP_H_

diff --git a/scrub/unicrash.c b/scrub/unicrash.c
index 24d4ea58211bbdd31632b228962991cf503d787a..dd0ec22feab5f05aae0b8eac316b9d60b36969ca 100644 (file)
--- a/scrub/unicrash.c
+++ b/scrub/unicrash.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/unicrash.h b/scrub/unicrash.h
index 755afaef18c974a12e2da18262ae75672614cf58..6ac56e7217681d9844f388f60a076047e64521f1 100644 (file)
--- a/scrub/unicrash.h
+++ b/scrub/unicrash.h
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_UNICRASH_H_
 #define XFS_SCRUB_UNICRASH_H_

diff --git a/scrub/vfs.c b/scrub/vfs.c
index 3c1825a75e7d8050e890f0898e0ff93ed89b9908..86e7910a1a6a7ffbe1976d9160d8017fd35b6f76 100644 (file)
--- a/scrub/vfs.c
+++ b/scrub/vfs.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <stdint.h>

diff --git a/scrub/vfs.h b/scrub/vfs.h
index dc1099cf18db5fd3b4833deb1197367f2288afda..24e04531227d43d738331dd53e3597fc33c444c2 100644 (file)
--- a/scrub/vfs.h
+++ b/scrub/vfs.h
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_VFS_H_
 #define XFS_SCRUB_VFS_H_

diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
index 597be59f9f985b09d3fa98a8800f29411aae0263..1c409690736c435d6c95ecd8e0cddbde27b5fc7b 100644 (file)
--- a/scrub/xfs_scrub.c
+++ b/scrub/xfs_scrub.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #include "xfs.h"
 #include <pthread.h>

diff --git a/scrub/xfs_scrub.h b/scrub/xfs_scrub.h
index 0d6b9dad2c970464915864555e33d56ace18cab2..1c45f8753af0c434ad061eaa7fb45e5182f80342 100644 (file)
--- a/scrub/xfs_scrub.h
+++ b/scrub/xfs_scrub.h
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Oracle.  All Rights Reserved.
- * Author: Darrick J. Wong <darrick.wong@oracle.com>
+ * Author: Darrick J. Wong <djwong@kernel.org>
  */
 #ifndef XFS_SCRUB_XFS_SCRUB_H_
 #define XFS_SCRUB_XFS_SCRUB_H_

diff --git a/scrub/xfs_scrub_all.in b/scrub/xfs_scrub_all.in
index 5b76b49adab84d9828682677288ae61fd58c0858..6276e32f515a806189014960ad6d9763a563f485 100644 (file)
--- a/scrub/xfs_scrub_all.in
+++ b/scrub/xfs_scrub_all.in
@@ -1,9 +1,9 @@
 #!/usr/bin/python3
 
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2018 Oracle.  All rights reserved.
 #
-# Author: Darrick J. Wong <darrick.wong@oracle.com>
+# Author: Darrick J. Wong <djwong@kernel.org>
 
 # Run online scrubbers in parallel, but avoid thrashing.