From 3662c26cfede48f1f695b7bbf0f082aa41c423d4 Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Sat, 7 Sep 2024 16:46:49 -0400 Subject: [PATCH] LU-6142 target: SPDX for generic target code Convert from verbose license text to SPDX. Test-Parameters: trivial Signed-off-by: Timothy Day Change-Id: Ia42c117c639750be0bc770beeade80789b2ddc54 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56292 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin --- lustre/target/Makefile.in | 6 ++++++ lustre/target/autoMakefile.am | 22 +++------------------- lustre/target/barrier.c | 25 ++----------------------- lustre/target/out_handler.c | 25 ++----------------------- lustre/target/out_lib.c | 26 +++----------------------- lustre/target/tgt_fmd.c | 26 +++----------------------- lustre/target/tgt_grant.c | 26 +++----------------------- lustre/target/tgt_handler.c | 27 +++------------------------ lustre/target/tgt_internal.h | 27 +++------------------------ lustre/target/tgt_lastrcvd.c | 25 ++++--------------------- lustre/target/tgt_main.c | 27 +++------------------------ lustre/target/tgt_mount.c | 27 ++++----------------------- lustre/target/update_records.c | 26 +++----------------------- lustre/target/update_recovery.c | 26 +++----------------------- lustre/target/update_trans.c | 26 +++----------------------- 15 files changed, 48 insertions(+), 319 deletions(-) diff --git a/lustre/target/Makefile.in b/lustre/target/Makefile.in index 5093f11..695518f 100644 --- a/lustre/target/Makefile.in +++ b/lustre/target/Makefile.in @@ -1,4 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# # This is included by ptlrpc +# target_objs := tgt_main.o tgt_lastrcvd.o target_objs += tgt_handler.o out_handler.o diff --git a/lustre/target/autoMakefile.am b/lustre/target/autoMakefile.am index 9207e44..3b1a5dc 100644 --- a/lustre/target/autoMakefile.am +++ b/lustre/target/autoMakefile.am @@ -1,23 +1,7 @@ +# 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 +# This file is part of Lustre, http://www.lustre.org/ # MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ diff --git a/lustre/target/barrier.c b/lustre/target/barrier.c index b348a26..5668bda 100644 --- a/lustre/target/barrier.c +++ b/lustre/target/barrier.c @@ -1,29 +1,8 @@ -/* - * 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 + /* * Copyright (c) 2017, Intel Corporation. * - * lustre/target/barrier.c - * * Currently, the Lustre barrier is implemented as write barrier on all MDTs. * For each MDT in the system, when it starts, it registers a barrier instance * that will be used in handling subsequent barrier requests. diff --git a/lustre/target/out_handler.c b/lustre/target/out_handler.c index 0faff1c..77e22ab 100644 --- a/lustre/target/out_handler.c +++ b/lustre/target/out_handler.c @@ -1,29 +1,8 @@ -/* - * 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) 2013, 2017, Intel Corporation. * - * lustre/target/out_handler.c - * * Object update handler between targets. * * Author: di.wang diff --git a/lustre/target/out_lib.c b/lustre/target/out_lib.c index 47a259f..1a4e914 100644 --- a/lustre/target/out_lib.c +++ b/lustre/target/out_lib.c @@ -1,30 +1,10 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * 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) 2014, 2017, Intel Corporation. */ + /* - * lustre/target/out_lib.c - * * Author: Di Wang * Author: Fan, Yong */ diff --git a/lustre/target/tgt_fmd.c b/lustre/target/tgt_fmd.c index f16604f..166419a 100644 --- a/lustre/target/tgt_fmd.c +++ b/lustre/target/tgt_fmd.c @@ -1,24 +1,5 @@ -/* - * 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 2008 Sun Microsystems, Inc. All rights reserved * Use is subject to license terms. @@ -27,11 +8,10 @@ * * Copyright (c) 2019, DDN Storage Corporation. */ + /* * This file is part of Lustre, http://www.lustre.org/ * - * lustre/target/tgt_fmd.c - * * This file provides functions to handle Filter Modification Data (FMD). * The FMD is responsible for file attributes to be applied in * Transaction ID (XID) order, so older requests can't re-write newer diff --git a/lustre/target/tgt_grant.c b/lustre/target/tgt_grant.c index a835071..23f9457 100644 --- a/lustre/target/tgt_grant.c +++ b/lustre/target/tgt_grant.c @@ -1,33 +1,13 @@ -/* - * 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) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * * Copyright (c) 2012, 2017, Intel Corporation. */ + /* - * lustre/target/tgt_grant.c - * * This file provides code related to grant space management on Lustre Targets * (OSTs and MDTs). Grant is a mechanism used by client nodes to reserve disk * space on a target for the data writeback cache. The Lustre client is thus diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c index 62889c8..bc52201 100644 --- a/lustre/target/tgt_handler.c +++ b/lustre/target/tgt_handler.c @@ -1,31 +1,10 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * 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) 2013, 2017, Intel Corporation. */ + /* - * lustre/target/tgt_handler.c - * * Lustre Unified Target request handler code * * Author: Brian Behlendorf diff --git a/lustre/target/tgt_internal.h b/lustre/target/tgt_internal.h index ed45f82..4b0df1a 100644 --- a/lustre/target/tgt_internal.h +++ b/lustre/target/tgt_internal.h @@ -1,31 +1,10 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * 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) 2012, 2017, Intel Corporation. */ + /* - * lustre/target/tgt_internal.h - * * Lustre Unified Target header file * * Author: Mikhail Pershin diff --git a/lustre/target/tgt_lastrcvd.c b/lustre/target/tgt_lastrcvd.c index f08abf0..7d56d11 100644 --- a/lustre/target/tgt_lastrcvd.c +++ b/lustre/target/tgt_lastrcvd.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) 2009, 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/ * @@ -33,6 +15,7 @@ * * Author: Mikhail Pershin */ + #include #include #include diff --git a/lustre/target/tgt_main.c b/lustre/target/tgt_main.c index 087598f..d0240ef 100644 --- a/lustre/target/tgt_main.c +++ b/lustre/target/tgt_main.c @@ -1,31 +1,10 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * 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) 2012, 2017, Intel Corporation. */ + /* - * lustre/target/tgt_main.c - * * Lustre Unified Target main initialization code * * Author: Mikhail Pershin diff --git a/lustre/target/tgt_mount.c b/lustre/target/tgt_mount.c index c62d76e..99484f6 100644 --- a/lustre/target/tgt_mount.c +++ b/lustre/target/tgt_mount.c @@ -1,39 +1,20 @@ -/* - * 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) 2013, 2017, Intel Corporation. */ + /* * This file is part of Lustre, http://www.lustre.org/ * - * lustre/obdclass/obd_mount_server.c - * * Server mount routines * * Author: Nathan Rutman */ + #define DEBUG_SUBSYSTEM S_CLASS #define D_MOUNT (D_SUPER | D_CONFIG /* | D_WARNING */) diff --git a/lustre/target/update_records.c b/lustre/target/update_records.c index eddf1f1..9c9d0ec 100644 --- a/lustre/target/update_records.c +++ b/lustre/target/update_records.c @@ -1,31 +1,10 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * 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) 2015, 2017, Intel Corporation. */ /* - * lustre/target/update_records.c - * * This file implement the methods to pack updates as update records, which * will be written to the disk as llog record, and might be used during * recovery. @@ -38,6 +17,7 @@ * * Author: Di Wang */ + #define DEBUG_SUBSYSTEM S_CLASS #include diff --git a/lustre/target/update_recovery.c b/lustre/target/update_recovery.c index 13707d4..b29945b 100644 --- a/lustre/target/update_recovery.c +++ b/lustre/target/update_recovery.c @@ -1,31 +1,10 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * 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) 2015, 2017, Intel Corporation. */ /* - * lustre/target/update_recovery.c - * * This file implement the methods to handle the update recovery. * * During DNE recovery, the recovery thread will redo the operation according @@ -41,6 +20,7 @@ * * Author: Di Wang */ + #define DEBUG_SUBSYSTEM S_CLASS #include diff --git a/lustre/target/update_trans.c b/lustre/target/update_trans.c index c5b8cf9..a3621c3 100644 --- a/lustre/target/update_trans.c +++ b/lustre/target/update_trans.c @@ -1,30 +1,10 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * 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) 2015, 2017, Intel Corporation. */ + /* - * lustre/target/update_trans.c - * * This file implements the update distribute transaction API. * * To manage the cross-MDT operation (distribute operation) transaction, -- 1.8.3.1