From 93e1e1036825e31c9a0c1f98b02a9968592e1110 Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Sun, 4 Aug 2024 23:01:24 -0400 Subject: [PATCH] LU-6142 kgnilnd: SPDX for GNI LND Convert from verbose license text to SPDX. Test-Parameters: trivial Signed-off-by: Timothy Day Change-Id: I429de7ecee8bd42d83401b4ede3a00947ba65210 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55931 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Shaun Tancheff Reviewed-by: Chris Horn Reviewed-by: jsimmons Reviewed-by: Oleg Drokin --- lnet/klnds/gnilnd/Makefile.in | 6 ++++++ lnet/klnds/gnilnd/autoMakefile.am | 9 +++++++-- lnet/klnds/gnilnd/gni_pub.h | 25 ++++++------------------- lnet/klnds/gnilnd/gnilnd.c | 29 +++++++++-------------------- lnet/klnds/gnilnd/gnilnd.h | 31 ++++++++++--------------------- lnet/klnds/gnilnd/gnilnd_api_wrap.h | 26 +++++++------------------- lnet/klnds/gnilnd/gnilnd_aries.h | 27 ++++++++------------------- lnet/klnds/gnilnd/gnilnd_cb.c | 30 +++++++++--------------------- lnet/klnds/gnilnd/gnilnd_conn.c | 28 ++++++++-------------------- lnet/klnds/gnilnd/gnilnd_debug.c | 26 +++++++------------------- lnet/klnds/gnilnd/gnilnd_gemini.h | 28 ++++++++-------------------- lnet/klnds/gnilnd/gnilnd_hss_ops.h | 28 ++++++++-------------------- lnet/klnds/gnilnd/gnilnd_modparams.c | 28 ++++++++-------------------- lnet/klnds/gnilnd/gnilnd_proc.c | 27 ++++++++------------------- lnet/klnds/gnilnd/gnilnd_stack.c | 27 ++++++++------------------- lnet/klnds/gnilnd/gnilnd_sysctl.c | 27 ++++++++------------------- 16 files changed, 125 insertions(+), 277 deletions(-) diff --git a/lnet/klnds/gnilnd/Makefile.in b/lnet/klnds/gnilnd/Makefile.in index 14e8c30..aaf89d7 100644 --- a/lnet/klnds/gnilnd/Makefile.in +++ b/lnet/klnds/gnilnd/Makefile.in @@ -1,3 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# + MODULES := kgnilnd kgnilnd-objs := gnilnd.o gnilnd_cb.o gnilnd_modparams.o gnilnd_debug.o gnilnd_proc.o \ gnilnd_sysctl.o gnilnd_stack.o gnilnd_conn.o diff --git a/lnet/klnds/gnilnd/autoMakefile.am b/lnet/klnds/gnilnd/autoMakefile.am index 888b68e..e01b1df 100644 --- a/lnet/klnds/gnilnd/autoMakefile.am +++ b/lnet/klnds/gnilnd/autoMakefile.am @@ -1,7 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0 + +# # Copyright (C) 2009 Cray, Inc. # -# This code is issued under the GNU General Public License. -# See the file COPYING in this distribution + +# +# This file is part of Lustre, http://www.lustre.org/ +# if MODULES if BUILD_GNILND diff --git a/lnet/klnds/gnilnd/gni_pub.h b/lnet/klnds/gnilnd/gni_pub.h index 84b977b9..9f5cb09 100644 --- a/lnet/klnds/gnilnd/gni_pub.h +++ b/lnet/klnds/gnilnd/gni_pub.h @@ -1,24 +1,11 @@ -/* -*- c-basic-offset: 8; indent-tabs-mode: nil -*- */ -/* - Contains the user interface to the GNI. Kernel and User level. - - Copyright 2007 Cray Inc. All Rights Reserved. - Written by Igor Gorodetsky - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, - or (at your option) any later version. +/* SPDX-License-Identifier: GPL-2.0 */ - 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 for more details. +/* Copyright 2007 Cray Inc. All Rights Reserved. */ - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ +/* Contains the user interface to the GNI. Kernel and User level. + * + * Author: Igor Gorodetsky + */ #ifndef _GNI_PUB_H_ #define _GNI_PUB_H_ diff --git a/lnet/klnds/gnilnd/gnilnd.c b/lnet/klnds/gnilnd/gnilnd.c index 675c885..3695176 100644 --- a/lnet/klnds/gnilnd/gnilnd.c +++ b/lnet/klnds/gnilnd/gnilnd.c @@ -1,27 +1,16 @@ -/* - * Copyright (C) 2012 Cray, Inc. +// SPDX-License-Identifier: GPL-2.0 + +/* Copyright (C) 2012 Cray, Inc. * * Copyright (c) 2013, 2017, Intel Corporation. + */ + +/* This file is part of Lustre, http://www.lustre.org. * - * Author: Nic Henke - * Author: James Shimek - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * Author: Nic Henke + * Author: James Shimek */ + #include "gnilnd.h" static int diff --git a/lnet/klnds/gnilnd/gnilnd.h b/lnet/klnds/gnilnd/gnilnd.h index ba15636..1bae528 100644 --- a/lnet/klnds/gnilnd/gnilnd.h +++ b/lnet/klnds/gnilnd/gnilnd.h @@ -1,30 +1,19 @@ -/* - * Copyright (C) 2004 Cluster File Systems, Inc. +/* SPDX-License-Identifier: GPL-2.0 */ + +/* Copyright (C) 2004 Cluster File Systems, Inc. * * Copyright (C) 2009-2012 Cray, Inc. * * Copyright (c) 2014, 2016, Intel Corporation. + */ + +/* This file is part of Lustre, http://www.lustre.org. * - * Derived from work by: Eric Barton - * Author: Nic Henke - * Author: James Shimek - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * Derived from work by: Eric Barton + * Author: Nic Henke + * Author: James Shimek */ + #ifndef _GNILND_GNILND_H_ #define _GNILND_GNILND_H_ diff --git a/lnet/klnds/gnilnd/gnilnd_api_wrap.h b/lnet/klnds/gnilnd/gnilnd_api_wrap.h index 91b822c..5c6fc5c 100644 --- a/lnet/klnds/gnilnd/gnilnd_api_wrap.h +++ b/lnet/klnds/gnilnd/gnilnd_api_wrap.h @@ -1,24 +1,12 @@ -/* - * Copyright (C) 2009-2012 Cray, Inc. - * - * Author: Nic Henke - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +/* SPDX-License-Identifier: GPL-2.0 */ + +/* Copyright (C) 2009-2012 Cray, Inc. */ + +/* This file is part of Lustre, http://www.lustre.org. * + * Author: Nic Henke */ + #ifndef _GNILND_API_WRAP_H #define _GNILND_API_WRAP_H diff --git a/lnet/klnds/gnilnd/gnilnd_aries.h b/lnet/klnds/gnilnd/gnilnd_aries.h index 431442f..cee718a 100644 --- a/lnet/klnds/gnilnd/gnilnd_aries.h +++ b/lnet/klnds/gnilnd/gnilnd_aries.h @@ -1,26 +1,15 @@ -/* - * Copyright (C) 2009-2012 Cray, Inc. +/* SPDX-License-Identifier: GPL-2.0 */ + +/* Copyright (C) 2009-2012 Cray, Inc. * * Copyright (c) 2014, Intel Corporation. + */ + +/* This file is part of Lustre, http://www.lustre.org. * - * Author: Nic Henke , James Shimek - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * Author: Nic Henke , James Shimek */ + #ifndef _GNILND_ARIES_H #define _GNILND_ARIES_H diff --git a/lnet/klnds/gnilnd/gnilnd_cb.c b/lnet/klnds/gnilnd/gnilnd_cb.c index 1f429aa..a1d7255 100644 --- a/lnet/klnds/gnilnd/gnilnd_cb.c +++ b/lnet/klnds/gnilnd/gnilnd_cb.c @@ -1,27 +1,15 @@ -/* - * Copyright (C) 2004 Cluster File Systems, Inc. +// SPDX-License-Identifier: GPL-2.0 + +/* Copyright (C) 2004 Cluster File Systems, Inc. * * Copyright (C) 2009-2012 Cray, Inc. + */ + +/* This file is part of Lustre, http://www.lustre.org. * - * Derived from work by Eric Barton - * Author: James Shimek - * Author: Nic Henke - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * Derived from work by Eric Barton + * Author: James Shimek + * Author: Nic Henke */ #include diff --git a/lnet/klnds/gnilnd/gnilnd_conn.c b/lnet/klnds/gnilnd/gnilnd_conn.c index f559308..f8c4c26 100644 --- a/lnet/klnds/gnilnd/gnilnd_conn.c +++ b/lnet/klnds/gnilnd/gnilnd_conn.c @@ -1,26 +1,14 @@ -/* - * Copyright (C) 2012 Cray, Inc. +// SPDX-License-Identifier: GPL-2.0 + +/* Copyright (C) 2012 Cray, Inc. * * Copyright (c) 2014, Intel Corporation. + */ + +/* This file is part of Lustre, http://www.lustre.org. * - * Author: Nic Henke - * Author: James Shimek - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * Author: Nic Henke + * Author: James Shimek */ #include "gnilnd.h" diff --git a/lnet/klnds/gnilnd/gnilnd_debug.c b/lnet/klnds/gnilnd/gnilnd_debug.c index 00f3c0f..0b24e67 100644 --- a/lnet/klnds/gnilnd/gnilnd_debug.c +++ b/lnet/klnds/gnilnd/gnilnd_debug.c @@ -1,24 +1,12 @@ -/* - * Copyright (C) 2009-2012 Cray, Inc. - * - * Author: Nic Henke - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// SPDX-License-Identifier: GPL-2.0 + +/* Copyright (C) 2009-2012 Cray, Inc. */ + +/* This file is part of Lustre, http://www.lustre.org. * + * Author: Nic Henke */ + #include "gnilnd.h" void diff --git a/lnet/klnds/gnilnd/gnilnd_gemini.h b/lnet/klnds/gnilnd/gnilnd_gemini.h index 4cb36a90..e9d5f8e 100644 --- a/lnet/klnds/gnilnd/gnilnd_gemini.h +++ b/lnet/klnds/gnilnd/gnilnd_gemini.h @@ -1,25 +1,13 @@ -/* - * Copyright (C) 2009-2012 Cray, Inc. - * - * Author: Nic Henke - * Author: James Shimek - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +/* SPDX-License-Identifier: GPL-2.0 */ + +/* Copyright (C) 2009-2012 Cray, Inc. */ + +/* This file is part of Lustre, http://www.lustre.org. * + * Author: Nic Henke + * Author: James Shimek */ + #ifndef _GNILND_GEMINI_H #define _GNILND_GEMINI_H diff --git a/lnet/klnds/gnilnd/gnilnd_hss_ops.h b/lnet/klnds/gnilnd/gnilnd_hss_ops.h index 8e5a902..d77615b 100644 --- a/lnet/klnds/gnilnd/gnilnd_hss_ops.h +++ b/lnet/klnds/gnilnd/gnilnd_hss_ops.h @@ -1,25 +1,13 @@ -/* - * Copyright (C) 2009-2012 Cray, Inc. - * - * Author: Nic Henke - * Author: James Shimek - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +/* SPDX-License-Identifier: GPL-2.0 */ + +/* Copyright (C) 2009-2012 Cray, Inc. */ + +/* This file is part of Lustre, http://www.lustre.org. * + * Author: Nic Henke + * Author: James Shimek */ + #ifndef _GNILND_HSS_OPS_H #define _GNILND_HSS_OPS_H diff --git a/lnet/klnds/gnilnd/gnilnd_modparams.c b/lnet/klnds/gnilnd/gnilnd_modparams.c index c1814a6..4a1bc74 100644 --- a/lnet/klnds/gnilnd/gnilnd_modparams.c +++ b/lnet/klnds/gnilnd/gnilnd_modparams.c @@ -1,26 +1,14 @@ -/* - * Copyright (C) 2004 Cluster File Systems, Inc. +// SPDX-License-Identifier: GPL-2.0 + +/* Copyright (C) 2004 Cluster File Systems, Inc. * * Copyright (C) 2009-2012 Cray, Inc. + */ + +/* This file is part of Lustre, http://www.lustre.org. * - * Derived from work by: Eric Barton - * Author: Nic Henke - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * Derived from work by: Eric Barton + * Author: Nic Henke */ #include "gnilnd.h" diff --git a/lnet/klnds/gnilnd/gnilnd_proc.c b/lnet/klnds/gnilnd/gnilnd_proc.c index 983d06e..d84dc0b 100644 --- a/lnet/klnds/gnilnd/gnilnd_proc.c +++ b/lnet/klnds/gnilnd/gnilnd_proc.c @@ -1,25 +1,14 @@ -/* - * Copyright (C) 2009-2012, 2016 Cray, Inc. +// SPDX-License-Identifier: GPL-2.0 + +/* Copyright (C) 2009-2012, 2016 Cray, Inc. * * Copyright (c) 2013, 2015, Intel Corporation. + */ + +/* This file is part of Lustre, http://www.lustre.org. * - * Author: Nic Henke - * Author: James Shimek - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Author: Nic Henke + * Author: James Shimek */ /* this code liberated and modified from lnet/lnet/router_proc.c */ diff --git a/lnet/klnds/gnilnd/gnilnd_stack.c b/lnet/klnds/gnilnd/gnilnd_stack.c index e3237f1..824d873 100644 --- a/lnet/klnds/gnilnd/gnilnd_stack.c +++ b/lnet/klnds/gnilnd/gnilnd_stack.c @@ -1,26 +1,15 @@ -/* - * Copyright (C) 2012 Cray, Inc. +// SPDX-License-Identifier: GPL-2.0 + +/* Copyright (C) 2012 Cray, Inc. * * Copyright (c) 2014, Intel Corporation. + */ + +/* This file is part of Lustre, http://www.lustre.org. * - * Author: Nic Henke - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * Author: Nic Henke */ + #include "gnilnd.h" #if defined(GNILND_USE_RCA) #include diff --git a/lnet/klnds/gnilnd/gnilnd_sysctl.c b/lnet/klnds/gnilnd/gnilnd_sysctl.c index c95f8d6..260f62c 100644 --- a/lnet/klnds/gnilnd/gnilnd_sysctl.c +++ b/lnet/klnds/gnilnd/gnilnd_sysctl.c @@ -1,25 +1,14 @@ -/* - * Copyright (C) 2012 Cray, Inc. +// SPDX-License-Identifier: GPL-2.0 + +/* Copyright (C) 2012 Cray, Inc. * * Copyright (c) 2014, Intel Corporation. + */ + +/* This file is part of Lustre, http://www.lustre.org. * - * Author: Nic Henke - * Author: James Shimek - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Author: Nic Henke + * Author: James Shimek */ /* this code liberated and modified from Lustre */ -- 1.8.3.1