From: Darrick J. Wong Date: Fri, 12 Jan 2024 02:07:04 +0000 (-0800) Subject: xfs_scrub: fix author and spdx headers on scrub/ files X-Git-Tag: v6.6.0~4^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d318d62dde5fcd4f15a730e4796a0685badb365;p=thirdparty%2Fxfsprogs-dev.git 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 Reviewed-by: Christoph Hellwig --- diff --git a/scrub/common.c b/scrub/common.c index 49a87f412..25a398c5f 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/common.h b/scrub/common.h index 13b5f3099..26ef7c861 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_COMMON_H_ #define XFS_SCRUB_COMMON_H_ diff --git a/scrub/counter.c b/scrub/counter.c index 6d91eb6e0..b63ec721c 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/counter.h b/scrub/counter.h index 01b65056a..77e380cc6 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_COUNTER_H_ #define XFS_SCRUB_COUNTER_H_ diff --git a/scrub/descr.c b/scrub/descr.c index e694d01d7..bf0c5717a 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/descr.h b/scrub/descr.h index f1899b672..0f5d9067e 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_DESCR_H_ #define XFS_SCRUB_DESCR_H_ diff --git a/scrub/disk.c b/scrub/disk.c index a1ef798a0..740a7ac96 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/disk.h b/scrub/disk.h index 36bfb8263..1f6c73aee 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_DISK_H_ #define XFS_SCRUB_DISK_H_ diff --git a/scrub/filemap.c b/scrub/filemap.c index d4905ace6..c1e520299 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/filemap.h b/scrub/filemap.h index 133e860bb..d123537aa 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_FILEMAP_H_ #define XFS_SCRUB_FILEMAP_H_ diff --git a/scrub/fscounters.c b/scrub/fscounters.c index 3ceae3715..6df0533a0 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/fscounters.h b/scrub/fscounters.h index 13bd9967f..fb0923afe 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_FSCOUNTERS_H_ #define XFS_SCRUB_FSCOUNTERS_H_ diff --git a/scrub/inodes.c b/scrub/inodes.c index 78f0914b8..d93791531 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/inodes.h b/scrub/inodes.h index f03180458..40e1291d1 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_INODES_H_ #define XFS_SCRUB_INODES_H_ diff --git a/scrub/phase1.c b/scrub/phase1.c index 2daf5c7bb..9e838fad9 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/phase2.c b/scrub/phase2.c index 8f82e2a6c..48c9f589f 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/phase3.c b/scrub/phase3.c index 65e903f23..98742e0b7 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/phase4.c b/scrub/phase4.c index ecd56056c..a67abd76a 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/phase5.c b/scrub/phase5.c index 314057096..4cf56ee59 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/phase6.c b/scrub/phase6.c index afdb16b68..e2de20c63 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/phase7.c b/scrub/phase7.c index 8d8034c36..fe928d79e 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/progress.c b/scrub/progress.c index a3d096f98..ffbf3ef36 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/progress.h b/scrub/progress.h index c1a115cbe..561695e2a 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_PROGRESS_H_ #define XFS_SCRUB_PROGRESS_H_ diff --git a/scrub/read_verify.c b/scrub/read_verify.c index be30f2688..435f54e2a 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/read_verify.h b/scrub/read_verify.h index 650c46d44..66f098954 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_READ_VERIFY_H_ #define XFS_SCRUB_READ_VERIFY_H_ diff --git a/scrub/repair.c b/scrub/repair.c index 5fc5ab836..107aa25a0 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/repair.h b/scrub/repair.h index 102e5779c..b67c1ac95 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_REPAIR_H_ #define XFS_SCRUB_REPAIR_H_ diff --git a/scrub/scrub.c b/scrub/scrub.c index 1469058bd..376dc1a16 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/scrub.h b/scrub/scrub.h index 023069ee0..b3e2742a1 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_SCRUB_H_ #define XFS_SCRUB_SCRUB_H_ diff --git a/scrub/spacemap.c b/scrub/spacemap.c index 03440d3a8..d0adae678 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/spacemap.h b/scrub/spacemap.h index 8a6d1e361..787f4652f 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_SPACEMAP_H_ #define XFS_SCRUB_SPACEMAP_H_ diff --git a/scrub/unicrash.c b/scrub/unicrash.c index 24d4ea582..dd0ec22fe 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/unicrash.h b/scrub/unicrash.h index 755afaef1..6ac56e721 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_UNICRASH_H_ #define XFS_SCRUB_UNICRASH_H_ diff --git a/scrub/vfs.c b/scrub/vfs.c index 3c1825a75..86e7910a1 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/vfs.h b/scrub/vfs.h index dc1099cf1..24e045312 100644 --- 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 + * Author: Darrick J. Wong */ #ifndef XFS_SCRUB_VFS_H_ #define XFS_SCRUB_VFS_H_ diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c index 597be59f9..1c4096907 100644 --- 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 + * Author: Darrick J. Wong */ #include "xfs.h" #include diff --git a/scrub/xfs_scrub.h b/scrub/xfs_scrub.h index 0d6b9dad2..1c45f8753 100644 --- 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 + * Author: Darrick J. Wong */ #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 5b76b49ad..6276e32f5 100644 --- 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 +# Author: Darrick J. Wong # Run online scrubbers in parallel, but avoid thrashing.