From 1a6137d160b2e7b732cec67b480209c6cb5ce908 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Wed, 21 May 2025 20:58:06 -0600 Subject: [PATCH] LU-5969 lnet: use LGPL-2.1+ for SPDX headers The change from explicit LGPL license text to SPDX headers introduced a number of incorrect license identifiers, because the "or (at your option) any later version" text was missed. Convert remaining library license blocks over to SPDX LGPL-2.1+. Reorder copyright and file description to be consistent. Remove filenames explicitly listed in the header block. Test-Parameters: trivial Fixes: e6aefbfaa6 ("LU-6142 libcfs: SPDX for libcfs module") Fixes: 56a9ba02ae ("LU-6142 libcfs: SPDX for libcfs headers") Fixes: c9a7728476 ("LU-6142 lnet: SPDX for lnet/include/ and misc files") Fixes: 9e3fd9ce8f ("LU-6142 lnet: SPDX for lnet/util/lnetconfig/") Fixes: 0f39311369 ("LU-6142 lnet: SPDX for lnet/utils/") Fixes: 14e981db6c ("LU-6142 misc: SPDX for Lustre headers") Signed-off-by: Andreas Dilger Change-Id: Ic2e9f70f82211ce5231c12d431ca63dc163ebbe5 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/59367 Reviewed-by: Oleg Drokin Reviewed-by: Arshad Hussain Reviewed-by: James Simmons Reviewed-by: Guillaume Courrier Reviewed-by: Cory Spitz Tested-by: jenkins Tested-by: Maloo --- libcfs/include/libcfs/util/param.h | 2 +- libcfs/libcfs/util/param.c | 2 +- lnet/include/uapi/linux/lnet/lnet-dlc.h | 2 +- lnet/include/uapi/linux/lnet/lnet-nl.h | 2 +- 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/lnetconfig/liblnetconfig_udsp.c | 2 +- lnet/utils/lnetctl.c | 2 +- lustre/include/lustre/lustreapi.h | 2 +- .../include/uapi/linux/lustre/lustre_access_log.h | 2 +- .../include/uapi/linux/lustre/lustre_kernelcomm.h | 2 +- lustre/include/uapi/linux/lustre/lustre_ver.h | 2 +- lustre/utils/liblustreapi.c | 24 +------------------ lustre/utils/liblustreapi_chlg.c | 20 ++-------------- lustre/utils/liblustreapi_fid.c | 28 +++++----------------- lustre/utils/liblustreapi_heat.c | 24 ++++--------------- lustre/utils/liblustreapi_hsm.c | 22 +++-------------- lustre/utils/liblustreapi_ioctl.c | 21 +--------------- lustre/utils/liblustreapi_json.c | 20 ++-------------- lustre/utils/liblustreapi_kernelconn.c | 22 +---------------- lustre/utils/liblustreapi_ladvise.c | 24 ++++--------------- lustre/utils/liblustreapi_layout.c | 22 +++-------------- lustre/utils/liblustreapi_lease.c | 20 ++-------------- lustre/utils/liblustreapi_lseek.c | 22 +++-------------- lustre/utils/liblustreapi_mirror.c | 22 +++-------------- lustre/utils/liblustreapi_nodemap.c | 22 ++++------------- lustre/utils/liblustreapi_param.c | 24 ++++--------------- lustre/utils/liblustreapi_pcc.c | 21 +--------------- lustre/utils/liblustreapi_root.c | 28 +++++----------------- lustre/utils/liblustreapi_swap.c | 28 +++++----------------- lustre/utils/liblustreapi_util.c | 22 +++-------------- 37 files changed, 78 insertions(+), 394 deletions(-) diff --git a/libcfs/include/libcfs/util/param.h b/libcfs/include/libcfs/util/param.h index a142537..6a2227b 100644 --- a/libcfs/include/libcfs/util/param.h +++ b/libcfs/include/libcfs/util/param.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (c) 2015, James Simmons diff --git a/libcfs/libcfs/util/param.c b/libcfs/libcfs/util/param.c index e219950..d768db7 100644 --- a/libcfs/libcfs/util/param.c +++ b/libcfs/libcfs/util/param.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1 +// SPDX-License-Identifier: LGPL-2.1+ /* * This code handles user interaction with the configuration interface diff --git a/lnet/include/uapi/linux/lnet/lnet-dlc.h b/lnet/include/uapi/linux/lnet/lnet-dlc.h index 5d7ab96..d08e725 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.1 WITH Linux-syscall-note */ +/* 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-nl.h b/lnet/include/uapi/linux/lnet/lnet-nl.h index 36013f1..6f57d71 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.1 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */ /* Copyright (c) 2021, UT-Battelle, LLC * diff --git a/lnet/utils/lnetconfig/Makefile.am b/lnet/utils/lnetconfig/Makefile.am index 0bd05cd..59bac4b 100644 --- a/lnet/utils/lnetconfig/Makefile.am +++ b/lnet/utils/lnetconfig/Makefile.am @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1 +# 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 0dd4a03..810a410 100644 --- a/lnet/utils/lnetconfig/cyaml.c +++ b/lnet/utils/lnetconfig/cyaml.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1 +// 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 30432cd..9d0dac5 100644 --- a/lnet/utils/lnetconfig/cyaml.h +++ b/lnet/utils/lnetconfig/cyaml.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* 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 7082b4a..508350f 100644 --- a/lnet/utils/lnetconfig/liblnd.h +++ b/lnet/utils/lnetconfig/liblnd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* 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 ffa2a24..c6dbbb9 100644 --- a/lnet/utils/lnetconfig/liblnetconfig.c +++ b/lnet/utils/lnetconfig/liblnetconfig.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1 +// 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 cdefb63..42a4d26 100644 --- a/lnet/utils/lnetconfig/liblnetconfig.h +++ b/lnet/utils/lnetconfig/liblnetconfig.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* 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 eae400c..72610d2 100644 --- a/lnet/utils/lnetconfig/liblnetconfig_lnd.c +++ b/lnet/utils/lnetconfig/liblnetconfig_lnd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1 +// 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 3c346e4..7949132 100644 --- a/lnet/utils/lnetconfig/liblnetconfig_netlink.c +++ b/lnet/utils/lnetconfig/liblnetconfig_netlink.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1 +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (c) 2021 UT-Battelle, LLC diff --git a/lnet/utils/lnetconfig/liblnetconfig_udsp.c b/lnet/utils/lnetconfig/liblnetconfig_udsp.c index d6b4a75..6e359dc 100644 --- a/lnet/utils/lnetconfig/liblnetconfig_udsp.c +++ b/lnet/utils/lnetconfig/liblnetconfig_udsp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. diff --git a/lnet/utils/lnetctl.c b/lnet/utils/lnetctl.c index 2e4e3b4..0573462 100644 --- a/lnet/utils/lnetctl.c +++ b/lnet/utils/lnetctl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1 +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (c) 2014, 2017, Intel Corporation. diff --git a/lustre/include/lustre/lustreapi.h b/lustre/include/lustre/lustreapi.h index 10b85b3..9e876f0 100644 --- a/lustre/include/lustre/lustreapi.h +++ b/lustre/include/lustre/lustreapi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. diff --git a/lustre/include/uapi/linux/lustre/lustre_access_log.h b/lustre/include/uapi/linux/lustre/lustre_access_log.h index 1d5e928..ff4a6a4 100644 --- a/lustre/include/uapi/linux/lustre/lustre_access_log.h +++ b/lustre/include/uapi/linux/lustre/lustre_access_log.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */ /* * This file is part of Lustre, http://www.lustre.org/ diff --git a/lustre/include/uapi/linux/lustre/lustre_kernelcomm.h b/lustre/include/uapi/linux/lustre/lustre_kernelcomm.h index 71c0d1b..1a3a448 100644 --- a/lustre/include/uapi/linux/lustre/lustre_kernelcomm.h +++ b/lustre/include/uapi/linux/lustre/lustre_kernelcomm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */ /* * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. diff --git a/lustre/include/uapi/linux/lustre/lustre_ver.h b/lustre/include/uapi/linux/lustre/lustre_ver.h index c9ed802..ffbb7aa 100644 --- a/lustre/include/uapi/linux/lustre/lustre_ver.h +++ b/lustre/include/uapi/linux/lustre/lustre_ver.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */ /* * This file is part of Lustre, http://www.lustre.org/ diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c index fd4a911..97e507d 100644 --- a/lustre/utils/liblustreapi.c +++ b/lustre/utils/liblustreapi.c @@ -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: LGPL-2.1+ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. @@ -28,8 +8,6 @@ /* * This file is part of Lustre, http://www.lustre.org/ * - * lustre/utils/liblustreapi.c - * * Author: Peter J. Braam * Author: Phil Schwan * Author: Robert Read diff --git a/lustre/utils/liblustreapi_chlg.c b/lustre/utils/liblustreapi_chlg.c index b993e45..c6572db 100644 --- a/lustre/utils/liblustreapi_chlg.c +++ b/lustre/utils/liblustreapi_chlg.c @@ -1,26 +1,10 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * * (C) Copyright 2017 Commissariat a l'energie atomique et aux energies * alternatives - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * (LGPL) version 2.1 or (at your discretion) any later version. - * (LGPL) version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END */ /* - * lustre/utils/liblustreapi_chlg.c + * This file is part of Lustre, http://www.lustre.org/ * * lustreapi library for filesystem changelog * diff --git a/lustre/utils/liblustreapi_fid.c b/lustre/utils/liblustreapi_fid.c index bf326bc..8827e78 100644 --- a/lustre/utils/liblustreapi_fid.c +++ b/lustre/utils/liblustreapi_fid.c @@ -1,33 +1,17 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * (LGPL) version 2.1 or (at your discretion) any later version. - * (LGPL) version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. * - * This library 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 - * Lesser General Public License for more details. + * Copyright (c) 2011, 2017, Intel Corporation. * - * LGPL HEADER END + * Copyright (c) 2018, 2019, Data Direct Networks */ /* - * lustre/utils/liblustreapi_fid.c + * This file is part of Lustre, http://www.lustre.org/ * * lustreapi library for FID mapping calls for determining the pathname * of Lustre files from the File IDentifier. - * - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - * - * Copyright (c) 2011, 2017, Intel Corporation. - * - * Copyright (c) 2018, 2019, Data Direct Networks */ /* for O_DIRECTORY and struct file_handle */ diff --git a/lustre/utils/liblustreapi_heat.c b/lustre/utils/liblustreapi_heat.c index b703444..4eac547 100644 --- a/lustre/utils/liblustreapi_heat.c +++ b/lustre/utils/liblustreapi_heat.c @@ -1,27 +1,11 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * (C) Copyright (c) 2018, DataDirect Networks Inc, all rights reserved. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * LGPL version 2.1 or (at your discretion) any later version. - * LGPL version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END + * Copyright (c) 2018, DataDirect Networks Inc, all rights reserved. */ /* - * lustre/utils/liblustreapi_heat.c + * This file is part of Lustre, http://www.lustre.org/ * - * lustreapi library for heat + * lustreapi library for file activity (heat) * * Author: Li Xi */ diff --git a/lustre/utils/liblustreapi_hsm.c b/lustre/utils/liblustreapi_hsm.c index 619b10e..3bfbed4 100644 --- a/lustre/utils/liblustreapi_hsm.c +++ b/lustre/utils/liblustreapi_hsm.c @@ -1,30 +1,14 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * * (C) Copyright 2012 Commissariat a l'energie atomique et aux energies * alternatives * * Copyright (c) 2013, 2017, Intel Corporation. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * (LGPL) version 2.1 or (at your discretion) any later version. - * (LGPL) version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END */ /* - * lustre/utils/liblustreapi_hsm.c + * This file is part of Lustre, http://www.lustre.org/ * - * lustreapi library for hsm calls + * library for heirarchical storage management (HSM) calls * * Author: Aurelien Degremont * Author: JC Lafoucriere diff --git a/lustre/utils/liblustreapi_ioctl.c b/lustre/utils/liblustreapi_ioctl.c index 6989c93..c42d154 100644 --- a/lustre/utils/liblustreapi_ioctl.c +++ b/lustre/utils/liblustreapi_ioctl.c @@ -1,26 +1,7 @@ -/* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * (LGPL) version 2.1 or (at your discretion) any later version. - * (LGPL) version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END - */ +// SPDX-License-Identifier: LGPL-2.1+ /* * This file is part of Lustre, http://www.lustre.org/ * - * lustre/utils/liblustreapi_ioctl.c - * * lustreapi library for packing/unpacking obd_ioctl_data structure to * send commands to different OBD devices. Mostly for internal use. * diff --git a/lustre/utils/liblustreapi_json.c b/lustre/utils/liblustreapi_json.c index 4c730ce..2151c9f 100644 --- a/lustre/utils/liblustreapi_json.c +++ b/lustre/utils/liblustreapi_json.c @@ -1,25 +1,9 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * * Copyright (c) 2014, Intel Corporation. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * (LGPL) version 2.1 or (at your discretion) any later version. - * (LGPL) version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END */ /* - * lustre/utils/liblustreapi_json.c + * This file is part of Lustre, http://www.lustre.org/ * * lustreapi library for json calls * diff --git a/lustre/utils/liblustreapi_kernelconn.c b/lustre/utils/liblustreapi_kernelconn.c index e93fa9e..295b25d 100644 --- a/lustre/utils/liblustreapi_kernelconn.c +++ b/lustre/utils/liblustreapi_kernelconn.c @@ -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: LGPL-2.1+ /* * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. diff --git a/lustre/utils/liblustreapi_ladvise.c b/lustre/utils/liblustreapi_ladvise.c index 6fd0209..de00669 100644 --- a/lustre/utils/liblustreapi_ladvise.c +++ b/lustre/utils/liblustreapi_ladvise.c @@ -1,27 +1,11 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * (C) Copyright (c) 2015, DataDirect Networks Inc, all rights reserved. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * LGPL version 2.1 or (at your discretion) any later version. - * LGPL version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END + * Copyright (c) 2015, DataDirect Networks, Inc, all rights reserved. */ /* - * lustre/utils/liblustreapi_ladvise.c + * This file is part of Lustre, http://www.lustre.org/ * - * lustreapi library for ladvise + * library for passing file access advice from applications to storage * * Author: Li Xi */ diff --git a/lustre/utils/liblustreapi_layout.c b/lustre/utils/liblustreapi_layout.c index c35fc72..5871354 100644 --- a/lustre/utils/liblustreapi_layout.c +++ b/lustre/utils/liblustreapi_layout.c @@ -1,30 +1,14 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * (LGPL) version 2.1 or (at your discretion) any later version. - * (LGPL) version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END + * Copyright (c) 2016, 2017, Intel Corporation. */ /* - * lustre/utils/liblustreapi_layout.c + * This file is part of Lustre, http://www.lustre.org/ * * lustreapi library for layout calls for interacting with the layout of * Lustre files while hiding details of the internal data structures * from the user. * - * Copyright (c) 2016, 2017, Intel Corporation. - * * Author: Ned Bass */ diff --git a/lustre/utils/liblustreapi_lease.c b/lustre/utils/liblustreapi_lease.c index f46db89..35aaa04 100644 --- a/lustre/utils/liblustreapi_lease.c +++ b/lustre/utils/liblustreapi_lease.c @@ -1,28 +1,12 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * * (C) Copyright 2014 Commissariat a l'energie atomique et aux energies * alternatives * * Copyright (c) 2017, Intel Corporation. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * (LGPL) version 2.1 or (at your discretion) any later version. - * (LGPL) version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END */ /* - * lustre/utils/liblustreapi_lease.c + * This file is part of Lustre, http://www.lustre.org/ * * lustreapi library for file leases * diff --git a/lustre/utils/liblustreapi_lseek.c b/lustre/utils/liblustreapi_lseek.c index 9073999..252286f 100644 --- a/lustre/utils/liblustreapi_lseek.c +++ b/lustre/utils/liblustreapi_lseek.c @@ -1,25 +1,9 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * (C) Copyright (c) 2020, DataDirect Networks Inc, all rights reserved. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * LGPL version 2.1 or (at your discretion) any later version. - * LGPL version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END + * Copyright (c) 2020, DataDirect Networks Inc, all rights reserved. */ /* - * lustre/utils/liblustreapi_lseek.c + * This file is part of Lustre, http://www.lustre.org/ * * lustreapi library for lseek-related functionality * diff --git a/lustre/utils/liblustreapi_mirror.c b/lustre/utils/liblustreapi_mirror.c index 50e0e51..6bb24d7 100644 --- a/lustre/utils/liblustreapi_mirror.c +++ b/lustre/utils/liblustreapi_mirror.c @@ -1,27 +1,11 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * (LGPL) version 2.1 or (at your discretion) any later version. - * (LGPL) version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END + * Copyright (c) 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ * - * lustre/utils/liblustreapi_mirror.c - * - * Copyright (c) 2017, Intel Corporation. + * library for creating and managing File Level Redundancy (FLR) mirrors * * Author: Jinshan Xiong */ diff --git a/lustre/utils/liblustreapi_nodemap.c b/lustre/utils/liblustreapi_nodemap.c index f66aeae..0655c92 100644 --- a/lustre/utils/liblustreapi_nodemap.c +++ b/lustre/utils/liblustreapi_nodemap.c @@ -1,25 +1,13 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * (LGPL) version 2.1 or (at your discretion) any later version. - * (LGPL) version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. + * Copyright (C) 2013, Trustees of Indiana University * - * LGPL HEADER END + * Copyright (c) 2014, Intel Corporation. */ /* - * Copyright (C) 2013, Trustees of Indiana University + * This file is part of Lustre, http://www.lustre.org/ * - * Copyright (c) 2014, Intel Corporation. + * lustreapi library for nodemap calls * * Author: Joshua Walgenbach */ diff --git a/lustre/utils/liblustreapi_param.c b/lustre/utils/liblustreapi_param.c index 1153ca2..d13fb79 100644 --- a/lustre/utils/liblustreapi_param.c +++ b/lustre/utils/liblustreapi_param.c @@ -1,28 +1,12 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * (LGPL) version 2.1 or (at your discretion) any later version. - * (LGPL) version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END + * Copyright (c) 2016, Intel Corporation. */ /* - * lustre/utils/liblustreapi_param.c + * This file is part of Lustre, http://www.lustre.org/ * * This code handles user interaction with the configuration interface - * to the Lustre file system to fine tune it. - * - * Copyright (c) 2016, Intel Corporation. + * to the Lustre file system to fine tune it and extract statistics. */ #include #include diff --git a/lustre/utils/liblustreapi_pcc.c b/lustre/utils/liblustreapi_pcc.c index 2c4bcbd..77676ff 100644 --- a/lustre/utils/liblustreapi_pcc.c +++ b/lustre/utils/liblustreapi_pcc.c @@ -1,28 +1,9 @@ -/* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * (LGPL) version 2.1 or (at your discretion) any later version. - * (LGPL) version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END - */ +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (c) 2017, DDN Storage Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ - */ -/* * * lustreapi library for Persistent Client Cache. * diff --git a/lustre/utils/liblustreapi_root.c b/lustre/utils/liblustreapi_root.c index a114b91..0e4f0fe 100644 --- a/lustre/utils/liblustreapi_root.c +++ b/lustre/utils/liblustreapi_root.c @@ -1,26 +1,5 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * (LGPL) version 2.1 or (at your discretion) any later version. - * (LGPL) version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END - */ -/* - * lustre/utils/liblustreapi_root.c - * - * lustreapi library for managing the root fd cache for llapi internal use. - * * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * @@ -28,6 +7,11 @@ * * Copyright (c) 2018, 2022, Data Direct Networks */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * + * lustreapi library for managing the root fd cache for llapi internal use. + */ /* for O_DIRECTORY and struct file_handle */ #ifndef _GNU_SOURCE diff --git a/lustre/utils/liblustreapi_swap.c b/lustre/utils/liblustreapi_swap.c index 1b50f2f..7ab190f 100644 --- a/lustre/utils/liblustreapi_swap.c +++ b/lustre/utils/liblustreapi_swap.c @@ -1,31 +1,15 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * (LGPL) version 2.1 or (at your discretion) any later version. - * (LGPL) version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END - */ -/* - * Copyright (c) 2012 Commissariat a l'energie atomique et aux energies + * (C) Copyright 2012 Commissariat a l'energie atomique et aux energies * alternatives + * * Copyright (c) 2017, 2021, DDN Storage Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ - */ -/* - * lustreapi library for file layout swapping. + * + * library for file layout exchange used by HSM, FLR, migration to + * transparently migrate data from one layout to another. */ #include diff --git a/lustre/utils/liblustreapi_util.c b/lustre/utils/liblustreapi_util.c index 817664f..311d185 100644 --- a/lustre/utils/liblustreapi_util.c +++ b/lustre/utils/liblustreapi_util.c @@ -1,27 +1,11 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* - * LGPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * (C) Copyright (c) 2015, Cray Inc, all rights reserved. + * Copyright (c) 2015, Cray Inc, all rights reserved. * * Copyright (c) 2016, 2017, Intel Corporation. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public License - * LGPL version 2.1 or (at your discretion) any later version. - * LGPL version 2.1 accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-2.1.html - * - * This library 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 - * Lesser General Public License for more details. - * - * LGPL HEADER END */ /* - * lustre/utils/liblustreapi_util.c + * This file is part of Lustre, http://www.lustre.org/ * * Misc LGPL-licenced utility functions for liblustreapi. * -- 1.8.3.1