From 0f39311369b97d7ce4e7e4d4f47b9068da805e51 Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Sun, 25 Feb 2024 02:47:07 +0000 Subject: [PATCH] LU-6142 lnet: SPDX for lnet/utils/ Convert from verbose license text to SDPX. Test-Parameters: trivial Signed-off-by: Timothy Day Change-Id: I0568f692c6799834794ed9c565bdac7ec9aef1d3 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54173 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Arshad Hussain Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lnet/utils/Makefile.am | 22 +--------------------- lnet/utils/lbstats | 2 -- lnet/utils/lnetctl.c | 29 ++++++++--------------------- lnet/utils/lnetunload | 2 -- lnet/utils/lst.c | 27 ++++----------------------- lnet/utils/routerstat.c | 24 +++--------------------- lnet/utils/wirecheck.c | 24 +++--------------------- 7 files changed, 19 insertions(+), 111 deletions(-) diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am index a5c4386..8c276c9 100644 --- a/lnet/utils/Makefile.am +++ b/lnet/utils/Makefile.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) 2003, 2010, Oracle and/or its affiliates. All rights reserved. diff --git a/lnet/utils/lbstats b/lnet/utils/lbstats index 039d45b..43d9e4b 100755 --- a/lnet/utils/lbstats +++ b/lnet/utils/lbstats @@ -4,8 +4,6 @@ # # This file is part of Lustre, http://www.lustre.org/ # -# lnet/utils/lbstats -# # Cleanly print out info about lnet router buffers, # network interfaces, and peers # diff --git a/lnet/utils/lnetctl.c b/lnet/utils/lnetctl.c index 97aa63d..47143d0 100644 --- a/lnet/utils/lnetctl.c +++ b/lnet/utils/lnetctl.c @@ -1,28 +1,15 @@ +// SPDX-License-Identifier: LGPL-2.0 + /* - * LGPL 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 Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of the - * License, or (at your option) any later version. - * - * 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. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - * - * LGPL HEADER END - * * Copyright (c) 2014, 2017, Intel Corporation. + */ + +/* + * This file is part of Lustre, http://www.lustre.org/ * - * Author: - * Amir Shehata + * Author: Amir Shehata */ + #include #include #include diff --git a/lnet/utils/lnetunload b/lnet/utils/lnetunload index cc81229..66ab769 100755 --- a/lnet/utils/lnetunload +++ b/lnet/utils/lnetunload @@ -4,8 +4,6 @@ # # This file is part of Lustre, http://www.lustre.org/ # -# lnet/utils/lnetunload -# # Unload lnet related kernel modules # diff --git a/lnet/utils/lst.c b/lnet/utils/lst.c index 1ebf56a..975d84b 100644 --- a/lnet/utils/lst.c +++ b/lnet/utils/lst.c @@ -1,37 +1,18 @@ -/* - * 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) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * * Copyright (c) 2012, 2017, Intel Corporation. */ + /* * This file is part of Lustre, http://www.lustre.org/ * - * lnet/selftest/conctl.c - * * Author: Liang Zhen */ + #include #include #include diff --git a/lnet/utils/routerstat.c b/lnet/utils/routerstat.c index e63deea..12507aa 100644 --- a/lnet/utils/routerstat.c +++ b/lnet/utils/routerstat.c @@ -1,30 +1,12 @@ -/* - * 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) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * * Copyright (c) 2011, Intel Corporation. */ + /* * This file is part of Lustre, http://www.lustre.org/ */ diff --git a/lnet/utils/wirecheck.c b/lnet/utils/wirecheck.c index e663d15..5038a3d 100644 --- a/lnet/utils/wirecheck.c +++ b/lnet/utils/wirecheck.c @@ -1,30 +1,12 @@ -/* - * 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) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * * Copyright (c) 2014, Intel Corporation. */ + /* * This file is part of Lustre, http://www.lustre.org/ */ -- 1.8.3.1