From 8b422d1c80f9ecae49a5a9a8389de1a9017989a3 Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Sun, 4 Aug 2024 13:43:33 -0400 Subject: [PATCH] LU-6142 lnet: update files with correct SPDX Some files were given LGPL-2.0 when they should have been LGPL-2.1 based on the previous license text. Add the Linux syscall note to UAPI headers. Add SPDX to a few missed files in LNET. Fixes: 0f39311369 ("LU-6142 lnet: SPDX for lnet/utils/") Fixes: c9a7728476 ("LU-6142 lnet: SPDX for lnet/include/ and misc files") Test-Parameters: trivial Signed-off-by: Timothy Day Change-Id: I6ceadfa182909ed4e3e52f88b4d37249cb30b6ef Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55930 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Arshad Hussain Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lnet/include/lnet/lib-cpt.h | 20 +++----------------- lnet/include/lnet/lnet_crypto.h | 23 +---------------------- lnet/include/uapi/linux/lnet/libcfs_debug.h | 2 +- lnet/include/uapi/linux/lnet/libcfs_ioctl.h | 2 +- lnet/include/uapi/linux/lnet/lnet-crypto.h | 23 +---------------------- lnet/include/uapi/linux/lnet/lnet-dlc.h | 2 +- lnet/include/uapi/linux/lnet/lnet-idl.h | 2 +- lnet/include/uapi/linux/lnet/lnet-nl.h | 2 +- lnet/include/uapi/linux/lnet/lnet-types.h | 2 +- lnet/include/uapi/linux/lnet/lnetctl.h | 2 +- lnet/include/uapi/linux/lnet/lnetst.h | 2 +- lnet/include/uapi/linux/lnet/nidstr.h | 2 +- lnet/include/uapi/linux/lnet/socklnd.h | 2 +- lnet/klnds/in-kernel-o2iblnd/Makefile.in | 6 ++++++ lnet/klnds/in-kernel-o2iblnd/autoMakefile.am | 22 +--------------------- lnet/lnet/adler.c | 23 +---------------------- lnet/lnet/adler.h | 24 +----------------------- lnet/lnet/lnet-crypto.c | 23 +---------------------- lnet/utils/lnetconfig/Makefile.am | 2 +- lnet/utils/lnetconfig/cyaml.c | 2 +- lnet/utils/lnetconfig/cyaml.h | 2 +- lnet/utils/lnetconfig/liblnd.h | 2 +- lnet/utils/lnetconfig/liblnetconfig.c | 2 +- lnet/utils/lnetconfig/liblnetconfig.h | 2 +- lnet/utils/lnetconfig/liblnetconfig_lnd.c | 2 +- lnet/utils/lnetconfig/liblnetconfig_netlink.c | 2 +- lnet/utils/lnetctl.c | 2 +- 27 files changed, 34 insertions(+), 168 deletions(-) diff --git a/lnet/include/lnet/lib-cpt.h b/lnet/include/lnet/lib-cpt.h index 55ef966..0763285 100644 --- a/lnet/include/lnet/lib-cpt.h +++ b/lnet/include/lnet/lib-cpt.h @@ -1,24 +1,10 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * GPL HEADER END - */ +/* SPDX-License-Identifier: GPL-2.0 */ + /* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * * Copyright (c) 2012, 2017, Intel Corporation. */ + /* This file is part of Lustre, http://www.lustre.org/ * * CPU partition diff --git a/lnet/include/lnet/lnet_crypto.h b/lnet/include/lnet/lnet_crypto.h index d718549..ef73c97 100644 --- a/lnet/include/lnet/lnet_crypto.h +++ b/lnet/include/lnet/lnet_crypto.h @@ -1,25 +1,4 @@ -/* GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see http://www.gnu.org/licenses - * - * Please visit http://www.xyratex.com/contact if you need additional - * information or have any questions. - * - * GPL HEADER END - */ +/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright 2012 Xyratex Technology Limited * diff --git a/lnet/include/uapi/linux/lnet/libcfs_debug.h b/lnet/include/uapi/linux/lnet/libcfs_debug.h index 26981c5..73c944d 100644 --- a/lnet/include/uapi/linux/lnet/libcfs_debug.h +++ b/lnet/include/uapi/linux/lnet/libcfs_debug.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. diff --git a/lnet/include/uapi/linux/lnet/libcfs_ioctl.h b/lnet/include/uapi/linux/lnet/libcfs_ioctl.h index d004c3a..0179e3e6 100644 --- a/lnet/include/uapi/linux/lnet/libcfs_ioctl.h +++ b/lnet/include/uapi/linux/lnet/libcfs_ioctl.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. diff --git a/lnet/include/uapi/linux/lnet/lnet-crypto.h b/lnet/include/uapi/linux/lnet/lnet-crypto.h index 6d0cf47..85875b4 100644 --- a/lnet/include/uapi/linux/lnet/lnet-crypto.h +++ b/lnet/include/uapi/linux/lnet/lnet-crypto.h @@ -1,25 +1,4 @@ -/* GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see http://www.gnu.org/licenses - * - * Please visit http://www.xyratex.com/contact if you need additional - * information or have any questions. - * - * GPL HEADER END - */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* Copyright 2012 Xyratex Technology Limited * diff --git a/lnet/include/uapi/linux/lnet/lnet-dlc.h b/lnet/include/uapi/linux/lnet/lnet-dlc.h index 6312427..de5e9ba 100644 --- a/lnet/include/uapi/linux/lnet/lnet-dlc.h +++ b/lnet/include/uapi/linux/lnet/lnet-dlc.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.0 +/* SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */ /* Copyright (c) 2014, 2017, Intel Corporation. */ diff --git a/lnet/include/uapi/linux/lnet/lnet-idl.h b/lnet/include/uapi/linux/lnet/lnet-idl.h index 39cdc60..48cbc4a 100644 --- a/lnet/include/uapi/linux/lnet/lnet-idl.h +++ b/lnet/include/uapi/linux/lnet/lnet-idl.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. diff --git a/lnet/include/uapi/linux/lnet/lnet-nl.h b/lnet/include/uapi/linux/lnet/lnet-nl.h index a41fcae..36013f1 100644 --- a/lnet/include/uapi/linux/lnet/lnet-nl.h +++ b/lnet/include/uapi/linux/lnet/lnet-nl.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.0 +/* SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */ /* Copyright (c) 2021, UT-Battelle, LLC * diff --git a/lnet/include/uapi/linux/lnet/lnet-types.h b/lnet/include/uapi/linux/lnet/lnet-types.h index c87b514..26b9c76 100644 --- a/lnet/include/uapi/linux/lnet/lnet-types.h +++ b/lnet/include/uapi/linux/lnet/lnet-types.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. diff --git a/lnet/include/uapi/linux/lnet/lnetctl.h b/lnet/include/uapi/linux/lnet/lnetctl.h index bf86aed..00ff591 100644 --- a/lnet/include/uapi/linux/lnet/lnetctl.h +++ b/lnet/include/uapi/linux/lnet/lnetctl.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* Copyright (c) 2014, 2017, Intel Corporation. */ diff --git a/lnet/include/uapi/linux/lnet/lnetst.h b/lnet/include/uapi/linux/lnet/lnetst.h index cb3ac96..0e8a105 100644 --- a/lnet/include/uapi/linux/lnet/lnetst.h +++ b/lnet/include/uapi/linux/lnet/lnetst.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. diff --git a/lnet/include/uapi/linux/lnet/nidstr.h b/lnet/include/uapi/linux/lnet/nidstr.h index 869f91a..23e57e9 100644 --- a/lnet/include/uapi/linux/lnet/nidstr.h +++ b/lnet/include/uapi/linux/lnet/nidstr.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. diff --git a/lnet/include/uapi/linux/lnet/socklnd.h b/lnet/include/uapi/linux/lnet/socklnd.h index 1ba43b0..0cb7ad5 100644 --- a/lnet/include/uapi/linux/lnet/socklnd.h +++ b/lnet/include/uapi/linux/lnet/socklnd.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. diff --git a/lnet/klnds/in-kernel-o2iblnd/Makefile.in b/lnet/klnds/in-kernel-o2iblnd/Makefile.in index 180756d..d686746 100644 --- a/lnet/klnds/in-kernel-o2iblnd/Makefile.in +++ b/lnet/klnds/in-kernel-o2iblnd/Makefile.in @@ -1,3 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# + MODULES := in-kernel-ko2iblnd in-kernel-ko2iblnd-objs := o2iblnd.o o2iblnd_cb.o o2iblnd_modparams.o diff --git a/lnet/klnds/in-kernel-o2iblnd/autoMakefile.am b/lnet/klnds/in-kernel-o2iblnd/autoMakefile.am index ceda0b8..4235c3b 100644 --- a/lnet/klnds/in-kernel-o2iblnd/autoMakefile.am +++ b/lnet/klnds/in-kernel-o2iblnd/autoMakefile.am @@ -1,24 +1,4 @@ -# -# GPL HEADER START -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 only, -# as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License version 2 for more details (a copy is included -# in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU General Public License -# version 2 along with this program; If not, see -# http://www.gnu.org/licenses/gpl-2.0.html -# -# GPL HEADER END -# +# SPDX-License-Identifier: GPL-2.0 # # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. diff --git a/lnet/lnet/adler.c b/lnet/lnet/adler.c index eaa4061..580e7b3 100644 --- a/lnet/lnet/adler.c +++ b/lnet/lnet/adler.c @@ -1,25 +1,4 @@ -/* GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see http://www.gnu.org/licenses - * - * Please visit http://www.xyratex.com/contact if you need additional - * information or have any questions. - * - * GPL HEADER END - */ +// SPDX-License-Identifier: GPL-2.0 /* Copyright 2012 Xyratex Technology Limited * diff --git a/lnet/lnet/adler.h b/lnet/lnet/adler.h index 326b59c..121fe9c 100644 --- a/lnet/lnet/adler.h +++ b/lnet/lnet/adler.h @@ -1,26 +1,4 @@ - /* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see http://www.gnu.org/licenses - * - * Please visit http://www.xyratex.com/contact if you need additional - * information or have any questions. - * - * GPL HEADER END - */ +/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright 2012 Xyratex Technology Limited * diff --git a/lnet/lnet/lnet-crypto.c b/lnet/lnet/lnet-crypto.c index ed75752..26feb7b 100644 --- a/lnet/lnet/lnet-crypto.c +++ b/lnet/lnet/lnet-crypto.c @@ -1,25 +1,4 @@ -/* GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see http://www.gnu.org/licenses - * - * Please visit http://www.xyratex.com/contact if you need additional - * information or have any questions. - * - * GPL HEADER END - */ +// SPDX-License-Identifier: GPL-2.0 /* Copyright 2012 Xyratex Technology Limited * diff --git a/lnet/utils/lnetconfig/Makefile.am b/lnet/utils/lnetconfig/Makefile.am index 87dd23d..0bd05cd 100644 --- a/lnet/utils/lnetconfig/Makefile.am +++ b/lnet/utils/lnetconfig/Makefile.am @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.0 +# SPDX-License-Identifier: LGPL-2.1 # # Copyright (c) 2014, 2017, Intel Corporation. diff --git a/lnet/utils/lnetconfig/cyaml.c b/lnet/utils/lnetconfig/cyaml.c index a71f72c..0dd4a03 100644 --- a/lnet/utils/lnetconfig/cyaml.c +++ b/lnet/utils/lnetconfig/cyaml.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.0 +// SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) 2014, 2017, Intel Corporation. diff --git a/lnet/utils/lnetconfig/cyaml.h b/lnet/utils/lnetconfig/cyaml.h index 471c704..30432cd 100644 --- a/lnet/utils/lnetconfig/cyaml.h +++ b/lnet/utils/lnetconfig/cyaml.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.0 +/* SPDX-License-Identifier: LGPL-2.1 */ /* * Copyright (c) 2014, 2017, Intel Corporation. diff --git a/lnet/utils/lnetconfig/liblnd.h b/lnet/utils/lnetconfig/liblnd.h index 8b6c28e..7082b4a 100644 --- a/lnet/utils/lnetconfig/liblnd.h +++ b/lnet/utils/lnetconfig/liblnd.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.0 +/* SPDX-License-Identifier: LGPL-2.1 */ /* * Copyright (c) 2015, James Simmons diff --git a/lnet/utils/lnetconfig/liblnetconfig.c b/lnet/utils/lnetconfig/liblnetconfig.c index 47b4f7f..4151446 100644 --- a/lnet/utils/lnetconfig/liblnetconfig.c +++ b/lnet/utils/lnetconfig/liblnetconfig.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.0 +// SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) 2014, 2017, Intel Corporation. diff --git a/lnet/utils/lnetconfig/liblnetconfig.h b/lnet/utils/lnetconfig/liblnetconfig.h index fad575e..ca47f30 100644 --- a/lnet/utils/lnetconfig/liblnetconfig.h +++ b/lnet/utils/lnetconfig/liblnetconfig.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.0 +/* SPDX-License-Identifier: LGPL-2.1 */ /* * Copyright (c) 2014, 2017, Intel Corporation. diff --git a/lnet/utils/lnetconfig/liblnetconfig_lnd.c b/lnet/utils/lnetconfig/liblnetconfig_lnd.c index 4e65e54..a925b71 100644 --- a/lnet/utils/lnetconfig/liblnetconfig_lnd.c +++ b/lnet/utils/lnetconfig/liblnetconfig_lnd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.0 +// SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) 2015, James Simmons diff --git a/lnet/utils/lnetconfig/liblnetconfig_netlink.c b/lnet/utils/lnetconfig/liblnetconfig_netlink.c index 066679770..3c346e4 100644 --- a/lnet/utils/lnetconfig/liblnetconfig_netlink.c +++ b/lnet/utils/lnetconfig/liblnetconfig_netlink.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.0 +// SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) 2021 UT-Battelle, LLC diff --git a/lnet/utils/lnetctl.c b/lnet/utils/lnetctl.c index 753ec51..72bdc5c 100644 --- a/lnet/utils/lnetctl.c +++ b/lnet/utils/lnetctl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.0 +// SPDX-License-Identifier: LGPL-2.1 /* * Copyright (c) 2014, 2017, Intel Corporation. -- 1.8.3.1