1 ext4: fix up remaining files with SPDX cleanups
3 A number of ext4 source files were skipped due because their copyright
4 permission statements didn't match the expected text used by the
5 automated conversion utilities. I've added SPDX tags for the rest.
7 While looking at some of these files, I've noticed that we have quite
8 a bit of variation on the licenses that were used --- in particular
9 some of the Red Hat licenses on the jbd2 files use a GPL2+ license,
10 and we have some files that have a LGPL-2.1 license (which was quite
13 I've not attempted to do any license changes. Even if it is perfectly
14 legal to relicense to GPL 2.0-only for consistency's sake, that should
15 be done with ext4 developer community discussion.
17 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
23 fs/ext4/ext4_extents.h | 14 +-------------
24 fs/ext4/ext4_jbd2.h | 5 +----
25 fs/ext4/extents.c | 14 +-------------
26 fs/ext4/extents_status.h | 2 +-
27 fs/ext4/fsmap.c | 15 +--------------
28 fs/ext4/fsmap.h | 15 +--------------
29 fs/ext4/hash.c | 6 +-----
30 fs/ext4/inline.c | 10 +---------
31 fs/ext4/mballoc.c | 14 +-------------
32 fs/ext4/mballoc.h | 2 +-
33 fs/ext4/migrate.c | 9 +--------
34 fs/ext4/move_extent.c | 10 +---------
36 fs/ext4/truncate.h | 2 +-
37 fs/ext4/xattr.h | 2 +-
38 fs/jbd2/checkpoint.c | 5 +----
39 fs/jbd2/commit.c | 5 +----
40 fs/jbd2/journal.c | 5 +----
41 fs/jbd2/recovery.c | 5 +----
42 fs/jbd2/revoke.c | 5 +----
43 fs/jbd2/transaction.c | 5 +----
44 23 files changed, 23 insertions(+), 132 deletions(-)
46 diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
47 index a48fc5ae2701..9b63f5416a2f 100644
51 -/* SPDX-License-Identifier: GPL-2.0 */
52 +// SPDX-License-Identifier: GPL-2.0
56 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
57 index 4e091eae38b1..891d7636a9d0 100644
61 -/* SPDX-License-Identifier: GPL-2.0 */
62 +// SPDX-License-Identifier: GPL-2.0
66 diff --git a/fs/ext4/ext4_extents.h b/fs/ext4/ext4_extents.h
67 index 8ecf84b8f5a1..98fb0c119c68 100644
68 --- a/fs/ext4/ext4_extents.h
69 +++ b/fs/ext4/ext4_extents.h
71 +// SPDX-License-Identifier: GPL-2.0
73 * Copyright (c) 2003-2006, Cluster File Systems, Inc, info@clusterfs.com
74 * Written by Alex Tomas <alex@clusterfs.com>
76 - * This program is free software; you can redistribute it and/or modify
77 - * it under the terms of the GNU General Public License version 2 as
78 - * published by the Free Software Foundation.
80 - * This program is distributed in the hope that it will be useful,
81 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
82 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
83 - * GNU General Public License for more details.
85 - * You should have received a copy of the GNU General Public License
86 - * along with this program; if not, write to the Free Software
87 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-
91 diff --git a/fs/ext4/ext4_jbd2.h b/fs/ext4/ext4_jbd2.h
92 index 48143e32411c..15b6dd733780 100644
93 --- a/fs/ext4/ext4_jbd2.h
94 +++ b/fs/ext4/ext4_jbd2.h
96 +// SPDX-License-Identifier: GPL-2.0+
102 * Copyright 1998--1999 Red Hat corp --- All Rights Reserved
104 - * This file is part of the Linux kernel and is made available under
105 - * the terms of the GNU General Public License, version 2, or at your
106 - * option, any later version, incorporated herein by reference.
108 * Ext4-specific journaling extensions.
111 diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
112 index c941251ac0c0..054416e9d827 100644
113 --- a/fs/ext4/extents.c
114 +++ b/fs/ext4/extents.c
116 +// SPDX-License-Identifier: GPL-2.0
118 * Copyright (c) 2003-2006, Cluster File Systems, Inc, info@clusterfs.com
119 * Written by Alex Tomas <alex@clusterfs.com>
121 * Architecture independence:
122 * Copyright (c) 2005, Bull S.A.
123 * Written by Pierre Peiffer <pierre.peiffer@bull.net>
125 - * This program is free software; you can redistribute it and/or modify
126 - * it under the terms of the GNU General Public License version 2 as
127 - * published by the Free Software Foundation.
129 - * This program is distributed in the hope that it will be useful,
130 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
131 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
132 - * GNU General Public License for more details.
134 - * You should have received a copy of the GNU General Public License
135 - * along with this program; if not, write to the Free Software
136 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-
140 diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h
141 index ca90fc96f47e..8efdeb903d6b 100644
142 --- a/fs/ext4/extents_status.h
143 +++ b/fs/ext4/extents_status.h
145 -/* SPDX-License-Identifier: GPL-2.0 */
146 +// SPDX-License-Identifier: GPL-2.0
148 * fs/ext4/extents_status.h
150 diff --git a/fs/ext4/fsmap.c b/fs/ext4/fsmap.c
151 index 7ec340898598..e871c4bf18e9 100644
152 --- a/fs/ext4/fsmap.c
153 +++ b/fs/ext4/fsmap.c
155 +// SPDX-License-Identifier: GPL-2.0+
157 * Copyright (C) 2017 Oracle. All Rights Reserved.
159 * Author: Darrick J. Wong <darrick.wong@oracle.com>
161 - * This program is free software; you can redistribute it and/or
162 - * modify it under the terms of the GNU General Public License
163 - * as published by the Free Software Foundation; either version 2
164 - * of the License, or (at your option) any later version.
166 - * This program is distributed in the hope that it would be useful,
167 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
168 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
169 - * GNU General Public License for more details.
171 - * You should have received a copy of the GNU General Public License
172 - * along with this program; if not, write the Free Software Foundation,
173 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
176 #include <linux/fsmap.h>
177 diff --git a/fs/ext4/fsmap.h b/fs/ext4/fsmap.h
178 index 9a2cd367cc66..68c8001fee85 100644
179 --- a/fs/ext4/fsmap.h
180 +++ b/fs/ext4/fsmap.h
182 +// SPDX-License-Identifier: GPL-2.0+
184 * Copyright (C) 2017 Oracle. All Rights Reserved.
186 * Author: Darrick J. Wong <darrick.wong@oracle.com>
188 - * This program is free software; you can redistribute it and/or
189 - * modify it under the terms of the GNU General Public License
190 - * as published by the Free Software Foundation; either version 2
191 - * of the License, or (at your option) any later version.
193 - * This program is distributed in the hope that it would be useful,
194 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
195 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
196 - * GNU General Public License for more details.
198 - * You should have received a copy of the GNU General Public License
199 - * along with this program; if not, write the Free Software Foundation,
200 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
202 #ifndef __EXT4_FSMAP_H__
203 #define __EXT4_FSMAP_H__
204 diff --git a/fs/ext4/hash.c b/fs/ext4/hash.c
205 index 00c6dd29e621..e22dcfab308b 100644
209 +// SPDX-License-Identifier: GPL-2.0
211 * linux/fs/ext4/hash.c
213 * Copyright (C) 2002 by Theodore Ts'o
215 - * This file is released under the GPL v2.
217 - * This file may be redistributed under the terms of the GNU Public
221 #include <linux/fs.h>
222 diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
223 index 1367553c43bb..8b1f2901a5df 100644
224 --- a/fs/ext4/inline.c
225 +++ b/fs/ext4/inline.c
227 +// SPDX-License-Identifier: LGPL-2.1
229 * Copyright (c) 2012 Taobao.
230 * Written by Tao Ma <boyu.mt@taobao.com>
232 - * This program is free software; you can redistribute it and/or modify it
233 - * under the terms of version 2.1 of the GNU Lesser General Public License
234 - * as published by the Free Software Foundation.
236 - * This program is distributed in the hope that it will be useful,
237 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
238 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
239 - * GNU General Public License for more details.
242 #include <linux/iomap.h>
243 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
244 index d9f8b90a93ed..1a7ea5f9276f 100644
245 --- a/fs/ext4/mballoc.c
246 +++ b/fs/ext4/mballoc.c
248 +// SPDX-License-Identifier: GPL-2.0
250 * Copyright (c) 2003-2006, Cluster File Systems, Inc, info@clusterfs.com
251 * Written by Alex Tomas <alex@clusterfs.com>
253 - * This program is free software; you can redistribute it and/or modify
254 - * it under the terms of the GNU General Public License version 2 as
255 - * published by the Free Software Foundation.
257 - * This program is distributed in the hope that it will be useful,
258 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
259 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
260 - * GNU General Public License for more details.
262 - * You should have received a copy of the GNU General Public License
263 - * along with this program; if not, write to the Free Software
264 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-
268 diff --git a/fs/ext4/mballoc.h b/fs/ext4/mballoc.h
269 index dcf52540f379..88c98f17e3d9 100644
270 --- a/fs/ext4/mballoc.h
271 +++ b/fs/ext4/mballoc.h
273 -/* SPDX-License-Identifier: GPL-2.0 */
274 +// SPDX-License-Identifier: GPL-2.0
278 diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c
279 index cf5181b62df1..61a9d1927817 100644
280 --- a/fs/ext4/migrate.c
281 +++ b/fs/ext4/migrate.c
283 +// SPDX-License-Identifier: LGPL-2.1
285 * Copyright IBM Corporation, 2007
286 * Author Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
288 - * This program is free software; you can redistribute it and/or modify it
289 - * under the terms of version 2.1 of the GNU Lesser General Public License
290 - * as published by the Free Software Foundation.
292 - * This program is distributed in the hope that it would be useful, but
293 - * WITHOUT ANY WARRANTY; without even the implied warranty of
294 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
298 #include <linux/slab.h>
299 diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
300 index 9bb36909ec92..b96e4bd3b3ec 100644
301 --- a/fs/ext4/move_extent.c
302 +++ b/fs/ext4/move_extent.c
304 +// SPDX-License-Identifier: LGPL-2.1
306 * Copyright (c) 2008,2009 NEC Software Tohoku, Ltd.
307 * Written by Takashi Sato <t-sato@yk.jp.nec.com>
308 * Akira Fujita <a-fujita@rs.jp.nec.com>
310 - * This program is free software; you can redistribute it and/or modify it
311 - * under the terms of version 2.1 of the GNU Lesser General Public License
312 - * as published by the Free Software Foundation.
314 - * This program is distributed in the hope that it will be useful,
315 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
316 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
317 - * GNU General Public License for more details.
320 #include <linux/fs.h>
321 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
322 index 7c46693a14d7..e5b9a305ff72 100644
323 --- a/fs/ext4/super.c
324 +++ b/fs/ext4/super.c
326 +// SPDX-License-Identifier: GPL-2.0
328 * linux/fs/ext4/super.c
330 diff --git a/fs/ext4/truncate.h b/fs/ext4/truncate.h
331 index b64a9fa0ff41..0cb13badf473 100644
332 --- a/fs/ext4/truncate.h
333 +++ b/fs/ext4/truncate.h
335 -/* SPDX-License-Identifier: GPL-2.0 */
336 +// SPDX-License-Identifier: GPL-2.0
338 * linux/fs/ext4/truncate.h
340 diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h
341 index f8cc07588ac9..dd54c4f995c8 100644
342 --- a/fs/ext4/xattr.h
343 +++ b/fs/ext4/xattr.h
345 -/* SPDX-License-Identifier: GPL-2.0 */
346 +// SPDX-License-Identifier: GPL-2.0
348 File: fs/ext4/xattr.h
350 diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
351 index 4055f51617ef..c125d662777c 100644
352 --- a/fs/jbd2/checkpoint.c
353 +++ b/fs/jbd2/checkpoint.c
355 +// SPDX-License-Identifier: GPL-2.0+
357 * linux/fs/jbd2/checkpoint.c
361 * Copyright 1999 Red Hat Software --- All Rights Reserved
363 - * This file is part of the Linux kernel and is made available under
364 - * the terms of the GNU General Public License, version 2, or at your
365 - * option, any later version, incorporated herein by reference.
367 * Checkpoint routines for the generic filesystem journaling code.
368 * Part of the ext2fs journaling system.
370 diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
371 index 3c1c31321d9b..8de0e7723316 100644
372 --- a/fs/jbd2/commit.c
373 +++ b/fs/jbd2/commit.c
375 +// SPDX-License-Identifier: GPL-2.0+
377 * linux/fs/jbd2/commit.c
381 * Copyright 1998 Red Hat corp --- All Rights Reserved
383 - * This file is part of the Linux kernel and is made available under
384 - * the terms of the GNU General Public License, version 2, or at your
385 - * option, any later version, incorporated herein by reference.
387 * Journal commit routines for the generic filesystem journaling code;
388 * part of the ext2fs journaling system.
390 diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
391 index 67546c7ad473..3fbf48ec2188 100644
392 --- a/fs/jbd2/journal.c
393 +++ b/fs/jbd2/journal.c
395 +// SPDX-License-Identifier: GPL-2.0+
397 * linux/fs/jbd2/journal.c
401 * Copyright 1998 Red Hat corp --- All Rights Reserved
403 - * This file is part of the Linux kernel and is made available under
404 - * the terms of the GNU General Public License, version 2, or at your
405 - * option, any later version, incorporated herein by reference.
407 * Generic filesystem journal-writing code; part of the ext2fs
410 diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c
411 index 02dd3360cb20..f99910b69c78 100644
412 --- a/fs/jbd2/recovery.c
413 +++ b/fs/jbd2/recovery.c
415 +// SPDX-License-Identifier: GPL-2.0+
417 * linux/fs/jbd2/recovery.c
421 * Copyright 1999-2000 Red Hat Software --- All Rights Reserved
423 - * This file is part of the Linux kernel and is made available under
424 - * the terms of the GNU General Public License, version 2, or at your
425 - * option, any later version, incorporated herein by reference.
427 * Journal recovery routines for the generic filesystem journaling code;
428 * part of the ext2fs journaling system.
430 diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c
431 index f9aefcda5854..696ef15ec942 100644
432 --- a/fs/jbd2/revoke.c
433 +++ b/fs/jbd2/revoke.c
435 +// SPDX-License-Identifier: GPL-2.0+
437 * linux/fs/jbd2/revoke.c
441 * Copyright 2000 Red Hat corp --- All Rights Reserved
443 - * This file is part of the Linux kernel and is made available under
444 - * the terms of the GNU General Public License, version 2, or at your
445 - * option, any later version, incorporated herein by reference.
447 * Journal revoke routines for the generic filesystem journaling code;
448 * part of the ext2fs journaling system.
450 diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
451 index 8b08044b3120..881a9e09ca4e 100644
452 --- a/fs/jbd2/transaction.c
453 +++ b/fs/jbd2/transaction.c
455 +// SPDX-License-Identifier: GPL-2.0+
457 * linux/fs/jbd2/transaction.c
461 * Copyright 1998 Red Hat corp --- All Rights Reserved
463 - * This file is part of the Linux kernel and is made available under
464 - * the terms of the GNU General Public License, version 2, or at your
465 - * option, any later version, incorporated herein by reference.
467 * Generic filesystem transaction handling code; part of the ext2fs