From 56a9ba02ae1effa0cce2171b23a74422d038fdc0 Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Sun, 8 Sep 2024 11:56:00 -0400 Subject: [PATCH] LU-6142 libcfs: SPDX for libcfs headers Convert from verbose license text to SPDX. Test-Parameters: trivial Signed-off-by: Timothy Day Change-Id: I84d166e5d37b1d29d968ca21683cc4047bde166d Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56298 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Arshad Hussain Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- libcfs/include/Makefile.am | 6 ++++ libcfs/include/libcfs/Makefile.am | 6 ++++ libcfs/include/libcfs/crypto/Makefile.am | 6 ++++ libcfs/include/libcfs/crypto/llcrypt.h | 3 ++ libcfs/include/libcfs/libcfs.h | 24 ++-------------- libcfs/include/libcfs/libcfs_debug.h | 27 ++---------------- libcfs/include/libcfs/libcfs_fail.h | 24 ++-------------- libcfs/include/libcfs/libcfs_hash.h | 27 ++---------------- libcfs/include/libcfs/libcfs_private.h | 27 ++---------------- libcfs/include/libcfs/libcfs_string.h | 26 ++---------------- libcfs/include/libcfs/linux/Makefile.am | 6 ++++ libcfs/include/libcfs/linux/glob.h | 1 + libcfs/include/libcfs/linux/linux-cpu.h | 27 ++---------------- libcfs/include/libcfs/linux/linux-fortify-string.h | 2 ++ libcfs/include/libcfs/linux/linux-fs.h | 26 ++---------------- libcfs/include/libcfs/linux/linux-hash.h | 22 +-------------- libcfs/include/libcfs/linux/linux-list.h | 22 +-------------- libcfs/include/libcfs/linux/linux-mem.h | 26 ++---------------- libcfs/include/libcfs/linux/linux-misc.h | 24 ++-------------- libcfs/include/libcfs/linux/linux-net.h | 22 +-------------- libcfs/include/libcfs/linux/linux-time.h | 26 ++---------------- libcfs/include/libcfs/linux/linux-wait.h | 1 + libcfs/include/libcfs/linux/processor.h | 1 + libcfs/include/libcfs/linux/refcount.h | 23 +++------------- libcfs/include/libcfs/linux/xarray.h | 1 + libcfs/include/libcfs/util/Makefile.am | 6 ++++ libcfs/include/libcfs/util/hash.h | 32 ++++++---------------- libcfs/include/libcfs/util/ioctl.h | 28 +++---------------- libcfs/include/libcfs/util/list.h | 22 +-------------- libcfs/include/libcfs/util/param.h | 29 +++++--------------- libcfs/include/libcfs/util/parser.h | 6 +--- libcfs/include/libcfs/util/string.h | 26 ++---------------- libcfs/include/uapi/Makefile.am | 6 ++++ libcfs/include/uapi/linux/Makefile.am | 6 ++++ libcfs/include/uapi/linux/llcrypt.h | 3 ++ 35 files changed, 118 insertions(+), 452 deletions(-) diff --git a/libcfs/include/Makefile.am b/libcfs/include/Makefile.am index 9152b79..74d62a0 100644 --- a/libcfs/include/Makefile.am +++ b/libcfs/include/Makefile.am @@ -1 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# + SUBDIRS = libcfs uapi diff --git a/libcfs/include/libcfs/Makefile.am b/libcfs/include/libcfs/Makefile.am index 12cd8a0..1d337cc 100644 --- a/libcfs/include/libcfs/Makefile.am +++ b/libcfs/include/libcfs/Makefile.am @@ -1,3 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# + SUBDIRS = linux util DIST_SUBDIRS = linux util SUBDIRS += crypto diff --git a/libcfs/include/libcfs/crypto/Makefile.am b/libcfs/include/libcfs/crypto/Makefile.am index e8cdd97..4113e4d 100644 --- a/libcfs/include/libcfs/crypto/Makefile.am +++ b/libcfs/include/libcfs/crypto/Makefile.am @@ -1 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# + EXTRA_DIST = llcrypt.h diff --git a/libcfs/include/libcfs/crypto/llcrypt.h b/libcfs/include/libcfs/crypto/llcrypt.h index 246954e..c8c883c 100644 --- a/libcfs/include/libcfs/crypto/llcrypt.h +++ b/libcfs/include/libcfs/crypto/llcrypt.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ + /* * llcrypt.h: declarations for per-file encryption * @@ -10,10 +11,12 @@ * Written by Michael Halcrow, 2015. * Modified by Jaegeuk Kim, 2015. */ + /* * Linux commit 219d54332a09 * tags/v5.4 */ + #ifndef _LINUX_LLCRYPT_H #define _LINUX_LLCRYPT_H diff --git a/libcfs/include/libcfs/libcfs.h b/libcfs/include/libcfs/libcfs.h index e599e9f..e8e1193 100644 --- a/libcfs/include/libcfs/libcfs.h +++ b/libcfs/include/libcfs/libcfs.h @@ -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) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * * Copyright (c) 2011, 2017, Intel Corporation. */ + /* * This file is part of Lustre, http://www.lustre.org/ */ diff --git a/libcfs/include/libcfs/libcfs_debug.h b/libcfs/include/libcfs/libcfs_debug.h index 4bdbd63..5c4be6e 100644 --- a/libcfs/include/libcfs/libcfs_debug.h +++ b/libcfs/include/libcfs/libcfs_debug.h @@ -1,37 +1,16 @@ -/* - * 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) 2008, 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/ * - * libcfs/include/libcfs/libcfs_debug.h - * * Debug messages and assertions - * */ #ifndef __LIBCFS_DEBUG_H__ diff --git a/libcfs/include/libcfs/libcfs_fail.h b/libcfs/include/libcfs/libcfs_fail.h index 994a853..8e7c3d5 100644 --- a/libcfs/include/libcfs/libcfs_fail.h +++ b/libcfs/include/libcfs/libcfs_fail.h @@ -1,32 +1,14 @@ -/* - * 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 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) 2011, 2014, Intel Corporation. */ + /* * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Oracle Corporation, Inc. */ #ifndef _LIBCFS_FAIL_H diff --git a/libcfs/include/libcfs/libcfs_hash.h b/libcfs/include/libcfs/libcfs_hash.h index cc5ec3b..60b882b 100644 --- a/libcfs/include/libcfs/libcfs_hash.h +++ b/libcfs/include/libcfs/libcfs_hash.h @@ -1,37 +1,16 @@ -/* - * 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) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * * Copyright (c) 2012, 2015, Intel Corporation. */ + /* * This file is part of Lustre, http://www.lustre.org/ * - * libcfs/include/libcfs/libcfs_hash.h - * * Hashing routines - * */ #ifndef __LIBCFS_HASH_H__ diff --git a/libcfs/include/libcfs/libcfs_private.h b/libcfs/include/libcfs/libcfs_private.h index 927e4ae..1aa0844 100644 --- a/libcfs/include/libcfs/libcfs_private.h +++ b/libcfs/include/libcfs/libcfs_private.h @@ -1,37 +1,16 @@ -/* - * 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) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * * Copyright (c) 2011, 2014, Intel Corporation. */ + /* * This file is part of Lustre, http://www.lustre.org/ * - * libcfs/include/libcfs/libcfs_private.h - * * Various defines for libcfs. - * */ #ifndef __LIBCFS_PRIVATE_H__ diff --git a/libcfs/include/libcfs/libcfs_string.h b/libcfs/include/libcfs/libcfs_string.h index 54bac97..8f2616f 100644 --- a/libcfs/include/libcfs/libcfs_string.h +++ b/libcfs/include/libcfs/libcfs_string.h @@ -1,35 +1,15 @@ -/* - * 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) 2008, 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/ * - * libcfs/include/libcfs/libcfs_string.h - * * Generic string manipulation functions. * * Author: Nathan Rutman diff --git a/libcfs/include/libcfs/linux/Makefile.am b/libcfs/include/libcfs/linux/Makefile.am index 3ecad9f..6d1ee9a 100644 --- a/libcfs/include/libcfs/linux/Makefile.am +++ b/libcfs/include/libcfs/linux/Makefile.am @@ -1,3 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# + EXTRA_DIST = linux-misc.h linux-fs.h linux-mem.h linux-time.h linux-cpu.h \ linux-list.h linux-hash.h linux-wait.h linux-net.h \ generic-radix-tree.h glob.h refcount.h processor.h xarray.h \ diff --git a/libcfs/include/libcfs/linux/glob.h b/libcfs/include/libcfs/linux/glob.h index fca03b5..401661a 100644 --- a/libcfs/include/libcfs/linux/glob.h +++ b/libcfs/include/libcfs/linux/glob.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ + #ifndef _LINUX_GLOB_H #define _LINUX_GLOB_H diff --git a/libcfs/include/libcfs/linux/linux-cpu.h b/libcfs/include/libcfs/linux/linux-cpu.h index 22ffe71..dae8968 100644 --- a/libcfs/include/libcfs/linux/linux-cpu.h +++ b/libcfs/include/libcfs/linux/linux-cpu.h @@ -1,35 +1,14 @@ -/* - * 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, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA - * - * 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/ * - * libcfs/include/libcfs/linux/linux-mem.h - * * Basic library routines. * * Author: liang@whamcloud.com diff --git a/libcfs/include/libcfs/linux/linux-fortify-string.h b/libcfs/include/libcfs/linux/linux-fortify-string.h index b8ec03e..a1418b6 100644 --- a/libcfs/include/libcfs/linux/linux-fortify-string.h +++ b/libcfs/include/libcfs/linux/linux-fortify-string.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + #ifndef _LIBCFS_FORTIFY_STRING_H #define _LIBCFS_FORTIFY_STRING_H diff --git a/libcfs/include/libcfs/linux/linux-fs.h b/libcfs/include/libcfs/linux/linux-fs.h index 8d25907..fc22ba78 100644 --- a/libcfs/include/libcfs/linux/linux-fs.h +++ b/libcfs/include/libcfs/linux/linux-fs.h @@ -1,35 +1,15 @@ -/* - * 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) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * * Copyright (c) 2012, 2016, Intel Corporation. */ + /* * This file is part of Lustre, http://www.lustre.org/ * - * libcfs/include/libcfs/linux/linux-fs.h - * * Basic library routines. */ diff --git a/libcfs/include/libcfs/linux/linux-hash.h b/libcfs/include/libcfs/linux/linux-hash.h index c7a04bc..9d4b1b0 100644 --- a/libcfs/include/libcfs/linux/linux-hash.h +++ b/libcfs/include/libcfs/linux/linux-hash.h @@ -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 */ #ifndef __LIBCFS_LINUX_HASH_H__ #define __LIBCFS_LINUX_HASH_H__ diff --git a/libcfs/include/libcfs/linux/linux-list.h b/libcfs/include/libcfs/linux/linux-list.h index c457bee..21d4900 100644 --- a/libcfs/include/libcfs/linux/linux-list.h +++ b/libcfs/include/libcfs/linux/linux-list.h @@ -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 COPYING file that accompanied this code. - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * GPL HEADER END - */ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __LIBCFS_LINUX_LIST_H__ #define __LIBCFS_LINUX_LIST_H__ diff --git a/libcfs/include/libcfs/linux/linux-mem.h b/libcfs/include/libcfs/linux/linux-mem.h index 55011f2..18a900e 100644 --- a/libcfs/include/libcfs/linux/linux-mem.h +++ b/libcfs/include/libcfs/linux/linux-mem.h @@ -1,35 +1,15 @@ -/* - * 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) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * * Copyright (c) 2011, 2014, Intel Corporation. */ + /* * This file is part of Lustre, http://www.lustre.org/ * - * libcfs/include/libcfs/linux/linux-mem.h - * * Basic library routines. */ diff --git a/libcfs/include/libcfs/linux/linux-misc.h b/libcfs/include/libcfs/linux/linux-misc.h index 75cc420..8e488ae 100644 --- a/libcfs/include/libcfs/linux/linux-misc.h +++ b/libcfs/include/libcfs/linux/linux-misc.h @@ -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) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * * Copyright (c) 2011, 2017, Intel Corporation. */ + /* * This file is part of Lustre, http://www.lustre.org/ */ diff --git a/libcfs/include/libcfs/linux/linux-net.h b/libcfs/include/libcfs/linux/linux-net.h index 6f9daf7..38781dd 100644 --- a/libcfs/include/libcfs/linux/linux-net.h +++ b/libcfs/include/libcfs/linux/linux-net.h @@ -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 */ #ifndef __LIBCFS_LINUX_NET_H__ #define __LIBCFS_LINUX_NET_H__ diff --git a/libcfs/include/libcfs/linux/linux-time.h b/libcfs/include/libcfs/linux/linux-time.h index 4a61fe1..e2b9b27 100644 --- a/libcfs/include/libcfs/linux/linux-time.h +++ b/libcfs/include/libcfs/linux/linux-time.h @@ -1,35 +1,15 @@ -/* - * 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) 2008, 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/ * - * libcfs/include/libcfs/linux/linux-time.h - * * Implementation of portable time API for Linux (kernel and user-level). * * Author: Nikita Danilov diff --git a/libcfs/include/libcfs/linux/linux-wait.h b/libcfs/include/libcfs/linux/linux-wait.h index cd62fab..36dc30f 100644 --- a/libcfs/include/libcfs/linux/linux-wait.h +++ b/libcfs/include/libcfs/linux/linux-wait.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ + #ifndef __LIBCFS_LINUX_WAIT_BIT_H #define __LIBCFS_LINUX_WAIT_BIT_H diff --git a/libcfs/include/libcfs/linux/processor.h b/libcfs/include/libcfs/linux/processor.h index 700d01e..b44d0aa 100644 --- a/libcfs/include/libcfs/linux/processor.h +++ b/libcfs/include/libcfs/linux/processor.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ + /* Misc low level processor primitives */ #ifndef _LINUX_PROCESSOR_H #define _LINUX_PROCESSOR_H diff --git a/libcfs/include/libcfs/linux/refcount.h b/libcfs/include/libcfs/linux/refcount.h index ecbf385..6e14c8f 100644 --- a/libcfs/include/libcfs/linux/refcount.h +++ b/libcfs/include/libcfs/linux/refcount.h @@ -1,24 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + /* - * 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 + * TODO: Remove after dropping RHEL7 support */ + #ifndef __LIBCFS_LINUX_REFCOUNT_H__ #define __LIBCFS_LINUX_REFCOUNT_H__ diff --git a/libcfs/include/libcfs/linux/xarray.h b/libcfs/include/libcfs/linux/xarray.h index 44d672f..da4a8f6 100644 --- a/libcfs/include/libcfs/linux/xarray.h +++ b/libcfs/include/libcfs/linux/xarray.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0+ */ + #ifndef _LINUX_XARRAY_LUSTRE_H #define _LINUX_XARRAY_LUSTRE_H /* diff --git a/libcfs/include/libcfs/util/Makefile.am b/libcfs/include/libcfs/util/Makefile.am index de35727..4287de9 100644 --- a/libcfs/include/libcfs/util/Makefile.am +++ b/libcfs/include/libcfs/util/Makefile.am @@ -1 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# + EXTRA_DIST = ioctl.h parser.h param.h list.h string.h hash.h diff --git a/libcfs/include/libcfs/util/hash.h b/libcfs/include/libcfs/util/hash.h index 45818dd..336c30a 100644 --- a/libcfs/include/libcfs/util/hash.h +++ b/libcfs/include/libcfs/util/hash.h @@ -1,31 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + /* - * 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 + * (C) 2002 Nadia Yvette Chambers, IBM */ -#ifndef _LINUX_HASH_H -#define _LINUX_HASH_H -/* Fast hashing routine for ints, longs and pointers. - (C) 2002 Nadia Yvette Chambers, IBM */ - /* + * Fast hashing routine for ints, longs and pointers. + * * Knuth recommends primes in approximately golden ratio to the maximum * integer representable by a machine word for multiplicative hashing. * Chuck Lever verified the effectiveness of this technique: @@ -36,6 +17,9 @@ * machines where multiplications are slow. */ +#ifndef _LINUX_HASH_H +#define _LINUX_HASH_H + #include /* 2^31 + 2^29 - 2^25 + 2^22 - 2^19 - 2^16 + 1 */ diff --git a/libcfs/include/libcfs/util/ioctl.h b/libcfs/include/libcfs/util/ioctl.h index c99fda6..442f3c0 100644 --- a/libcfs/include/libcfs/util/ioctl.h +++ b/libcfs/include/libcfs/util/ioctl.h @@ -1,38 +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) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * * Copyright (c) 2014, 2017, Intel Corporation. */ + /* * This file is part of Lustre, http://www.lustre.org/ * - * libcfs/include/libcfs/util/ioctl.h - * * Utility functions for calling ioctls. - * */ + #ifndef _LIBCFS_IOCTL_H_ #define _LIBCFS_IOCTL_H_ diff --git a/libcfs/include/libcfs/util/list.h b/libcfs/include/libcfs/util/list.h index fd6412c..18dfb96 100644 --- a/libcfs/include/libcfs/util/list.h +++ b/libcfs/include/libcfs/util/list.h @@ -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 COPYING file that accompanied this code. - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * GPL HEADER END - */ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __LIBCFS_UTIL_LIST_H__ #define __LIBCFS_UTIL_LIST_H__ diff --git a/libcfs/include/libcfs/util/param.h b/libcfs/include/libcfs/util/param.h index 2fd1e36..a142537 100644 --- a/libcfs/include/libcfs/util/param.h +++ b/libcfs/include/libcfs/util/param.h @@ -1,28 +1,13 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ + /* - * 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) 2015, James Simmons - * - * Author: - * James Simmons */ + +/* + * Author: James Simmons + */ + #ifndef _LIBCFS_UTIL_PARAM_H_ #define _LIBCFS_UTIL_PARAM_H_ diff --git a/libcfs/include/libcfs/util/parser.h b/libcfs/include/libcfs/util/parser.h index dd2c8c3..3169644 100644 --- a/libcfs/include/libcfs/util/parser.h +++ b/libcfs/include/libcfs/util/parser.h @@ -1,20 +1,16 @@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * * Copyright (c) 2014, 2017, Intel Corporation. - * */ /* * This file is part of Lustre, http://www.lustre.org/ * - * libcfs/include/libcfs/util/parser.h - * * A command line parser. - * */ #ifndef _PARSER_H_ diff --git a/libcfs/include/libcfs/util/string.h b/libcfs/include/libcfs/util/string.h index d484d10..f704fbe 100644 --- a/libcfs/include/libcfs/util/string.h +++ b/libcfs/include/libcfs/util/string.h @@ -1,35 +1,15 @@ -/* - * 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) 2008, 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/ * - * libcfs/include/libcfs/libcfs_string.h - * * Generic string manipulation functions. * * Author: Nathan Rutman diff --git a/libcfs/include/uapi/Makefile.am b/libcfs/include/uapi/Makefile.am index 08b2f5f..0fdf823 100644 --- a/libcfs/include/uapi/Makefile.am +++ b/libcfs/include/uapi/Makefile.am @@ -1 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# + SUBDIRS = linux diff --git a/libcfs/include/uapi/linux/Makefile.am b/libcfs/include/uapi/linux/Makefile.am index e8cdd97..4113e4d 100644 --- a/libcfs/include/uapi/linux/Makefile.am +++ b/libcfs/include/uapi/linux/Makefile.am @@ -1 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# + EXTRA_DIST = llcrypt.h diff --git a/libcfs/include/uapi/linux/llcrypt.h b/libcfs/include/uapi/linux/llcrypt.h index c133859..b536bdd 100644 --- a/libcfs/include/uapi/linux/llcrypt.h +++ b/libcfs/include/uapi/linux/llcrypt.h @@ -1,14 +1,17 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ + /* * llcrypt user API * * These ioctls can be used on filesystems that support llcrypt. See the * "User API" section of Documentation/filesystems/llcrypt.rst. */ + /* * Linux commit 219d54332a09 * tags/v5.4 */ + #ifndef _UAPI_LINUX_LLCRYPT_H #define _UAPI_LINUX_LLCRYPT_H -- 1.8.3.1