Replace the pre-SPDX "This file is part of DRBD by ..." blocks with plain kernel-style copyright notices, and add the missing ones. The license is carried by the SPDX identifier since commit 93c68cc46a07 ("drbd: use consistent license"), so the prose about it in every file is redundant. The file name lines were partly wrong anyway (drbd_vli.h calls itself drbd_receiver.c, drbd_strings.c calls itself drbd.h). This is the header layout the out-of-tree DRBD 9 sources carry, so the upcoming rework no longer touches the first lines of every file. No functional change. Signed-off-by: Christoph Böhmwalder --- drivers/block/drbd/drbd_actlog.c | 13 ++++--------- drivers/block/drbd/drbd_bitmap.c | 12 ++++-------- drivers/block/drbd/drbd_debugfs.c | 4 ++++ drivers/block/drbd/drbd_debugfs.h | 4 ++++ drivers/block/drbd/drbd_int.h | 15 +++++---------- drivers/block/drbd/drbd_interval.c | 4 ++++ drivers/block/drbd/drbd_interval.h | 4 ++++ drivers/block/drbd/drbd_main.c | 16 ++++------------ drivers/block/drbd/drbd_nl.c | 13 ++++--------- drivers/block/drbd/drbd_proc.c | 10 +--------- drivers/block/drbd/drbd_protocol.h | 4 ++++ drivers/block/drbd/drbd_receiver.c | 13 ++++--------- drivers/block/drbd/drbd_req.c | 13 ++++--------- drivers/block/drbd/drbd_req.h | 12 ++++-------- drivers/block/drbd/drbd_sender.c | 15 +++++---------- drivers/block/drbd/drbd_state.c | 15 ++++----------- drivers/block/drbd/drbd_strings.c | 12 ++---------- drivers/block/drbd/drbd_strings.h | 4 ++++ drivers/block/drbd/drbd_vli.h | 12 ++++-------- include/uapi/linux/drbd.h | 12 ++---------- include/uapi/linux/drbd_limits.h | 5 ++--- 21 files changed, 77 insertions(+), 135 deletions(-) diff --git a/drivers/block/drbd/drbd_actlog.c b/drivers/block/drbd/drbd_actlog.c index b3dbf6c76e98..04b8d50e4e9e 100644 --- a/drivers/block/drbd/drbd_actlog.c +++ b/drivers/block/drbd/drbd_actlog.c @@ -1,14 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only /* - drbd_actlog.c - - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2003-2008, LINBIT Information Technologies GmbH. - Copyright (C) 2003-2008, Philipp Reisner . - Copyright (C) 2003-2008, Lars Ellenberg . - - + * Copyright (C) 2003-2008, LINBIT Information Technologies GmbH. + * Copyright (C) 2003-2008, Philipp Reisner . + * Copyright (C) 2003-2008, Lars Ellenberg . + * Copyright (C) 2008, LINBIT HA-Solutions GmbH. */ #include diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c index 65ea6ec66bfd..8416c7e8257c 100644 --- a/drivers/block/drbd/drbd_bitmap.c +++ b/drivers/block/drbd/drbd_bitmap.c @@ -1,13 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only /* - drbd_bitmap.c - - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2004-2008, LINBIT Information Technologies GmbH. - Copyright (C) 2004-2008, Philipp Reisner . - Copyright (C) 2004-2008, Lars Ellenberg . - + * Copyright (C) 2004-2008, LINBIT Information Technologies GmbH. + * Copyright (C) 2004-2008, Philipp Reisner . + * Copyright (C) 2004-2008, Lars Ellenberg . + * Copyright (C) 2008, LINBIT HA-Solutions GmbH. */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/drivers/block/drbd/drbd_debugfs.c b/drivers/block/drbd/drbd_debugfs.c index 371abcd7e880..b8e698dbb475 100644 --- a/drivers/block/drbd/drbd_debugfs.c +++ b/drivers/block/drbd/drbd_debugfs.c @@ -1,4 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2014, LINBIT HA-Solutions GmbH. + */ + #define pr_fmt(fmt) "drbd debugfs: " fmt #include #include diff --git a/drivers/block/drbd/drbd_debugfs.h b/drivers/block/drbd/drbd_debugfs.h index ee3d66eb40c6..e02960c6ec35 100644 --- a/drivers/block/drbd/drbd_debugfs.h +++ b/drivers/block/drbd/drbd_debugfs.h @@ -1,4 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2014, LINBIT HA-Solutions GmbH. + */ + #include #include #include diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 48b45c3142f7..d3ca2b730a11 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -1,15 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - drbd_int.h - - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. - Copyright (C) 1999-2008, Philipp Reisner . - Copyright (C) 2002-2008, Lars Ellenberg . - - -*/ + * Copyright (C) 1999-2008, Philipp Reisner . + * Copyright (C) 2002-2008, Lars Ellenberg . + * Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. + * Copyright (C) 2008, LINBIT HA-Solutions GmbH. + */ #ifndef _DRBD_INT_H #define _DRBD_INT_H diff --git a/drivers/block/drbd/drbd_interval.c b/drivers/block/drbd/drbd_interval.c index 873beda6de24..2c12297ffdaf 100644 --- a/drivers/block/drbd/drbd_interval.c +++ b/drivers/block/drbd/drbd_interval.c @@ -1,4 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2011, LINBIT HA-Solutions GmbH. + */ + #include #include #include "drbd_interval.h" diff --git a/drivers/block/drbd/drbd_interval.h b/drivers/block/drbd/drbd_interval.h index 5d3213b81eed..9d290ac120cd 100644 --- a/drivers/block/drbd/drbd_interval.h +++ b/drivers/block/drbd/drbd_interval.h @@ -1,4 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2011, LINBIT HA-Solutions GmbH. + */ + #ifndef __DRBD_INTERVAL_H #define __DRBD_INTERVAL_H diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index a2a841c89201..590ac5cb84f5 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -1,17 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only /* - drbd.c - - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. - Copyright (C) 1999-2008, Philipp Reisner . - Copyright (C) 2002-2008, Lars Ellenberg . - - Thanks to Carter Burden, Bart Grantham and Gennadiy Nerubayev - from Logicworks, Inc. for making SDP replication support possible. - - + * Copyright (C) 1999-2008, Philipp Reisner . + * Copyright (C) 2002-2008, Lars Ellenberg . + * Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. + * Copyright (C) 2008, LINBIT HA-Solutions GmbH. */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index b77f901fc3ef..51ba8e542928 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -1,14 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only /* - drbd_nl.c - - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. - Copyright (C) 1999-2008, Philipp Reisner . - Copyright (C) 2002-2008, Lars Ellenberg . - - + * Copyright (C) 1999-2008, Philipp Reisner . + * Copyright (C) 2002-2008, Lars Ellenberg . + * Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. + * Copyright (C) 2008, LINBIT HA-Solutions GmbH. */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c index 6d0c12c10260..fb2b68c5c5f7 100644 --- a/drivers/block/drbd/drbd_proc.c +++ b/drivers/block/drbd/drbd_proc.c @@ -1,14 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - drbd_proc.c - - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. - Copyright (C) 1999-2008, Philipp Reisner . - Copyright (C) 2002-2008, Lars Ellenberg . - - + * Copyright (C) 2001, LINBIT HA-Solutions GmbH. */ #include diff --git a/drivers/block/drbd/drbd_protocol.h b/drivers/block/drbd/drbd_protocol.h index 56bbca9d7700..be7dacac5a86 100644 --- a/drivers/block/drbd/drbd_protocol.h +++ b/drivers/block/drbd/drbd_protocol.h @@ -1,4 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2014, LINBIT HA-Solutions GmbH. + */ + #ifndef __DRBD_PROTOCOL_H #define __DRBD_PROTOCOL_H diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 2135c14354a8..2c4507add143 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -1,16 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-only /* - drbd_receiver.c - - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. - Copyright (C) 1999-2008, Philipp Reisner . - Copyright (C) 2002-2008, Lars Ellenberg . - + * Copyright (C) 1999-2008, Philipp Reisner . + * Copyright (C) 2002-2008, Lars Ellenberg . + * Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. + * Copyright (C) 2008, LINBIT HA-Solutions GmbH. */ - #include #include diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 70f75ef07945..1648d0dabcbd 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -1,14 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only /* - drbd_req.c - - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. - Copyright (C) 1999-2008, Philipp Reisner . - Copyright (C) 2002-2008, Lars Ellenberg . - - + * Copyright (C) 1999-2008, Philipp Reisner . + * Copyright (C) 2002-2008, Lars Ellenberg . + * Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. + * Copyright (C) 2008, LINBIT HA-Solutions GmbH. */ #include diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h index 9ae860e7591b..51b12a960e45 100644 --- a/drivers/block/drbd/drbd_req.h +++ b/drivers/block/drbd/drbd_req.h @@ -1,13 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - drbd_req.h - - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2006-2008, LINBIT Information Technologies GmbH. - Copyright (C) 2006-2008, Lars Ellenberg . - Copyright (C) 2006-2008, Philipp Reisner . - + * Copyright (C) 2006-2008, Lars Ellenberg . + * Copyright (C) 2006-2008, Philipp Reisner . + * Copyright (C) 2006-2008, LINBIT Information Technologies GmbH. + * Copyright (C) 2008, LINBIT HA-Solutions GmbH. */ #ifndef _DRBD_REQ_H diff --git a/drivers/block/drbd/drbd_sender.c b/drivers/block/drbd/drbd_sender.c index 0697f99fed18..df0b6c99a59f 100644 --- a/drivers/block/drbd/drbd_sender.c +++ b/drivers/block/drbd/drbd_sender.c @@ -1,15 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-only /* - drbd_worker.c - - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. - Copyright (C) 1999-2008, Philipp Reisner . - Copyright (C) 2002-2008, Lars Ellenberg . - - -*/ + * Copyright (C) 1999-2008, Philipp Reisner . + * Copyright (C) 2002-2008, Lars Ellenberg . + * Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. + * Copyright (C) 2008, LINBIT HA-Solutions GmbH. + */ #include #include diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index adcba7f1d8ea..f1a5d899fd54 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -1,16 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only /* - drbd_state.c - - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. - Copyright (C) 1999-2008, Philipp Reisner . - Copyright (C) 2002-2008, Lars Ellenberg . - - Thanks to Carter Burden, Bart Grantham and Gennadiy Nerubayev - from Logicworks, Inc. for making SDP replication support possible. - + * Copyright (C) 1999-2008, Philipp Reisner . + * Copyright (C) 2002-2008, Lars Ellenberg . + * Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. + * Copyright (C) 2008, LINBIT HA-Solutions GmbH. */ #include diff --git a/drivers/block/drbd/drbd_strings.c b/drivers/block/drbd/drbd_strings.c index 0a06f744b096..a35ff87a93b1 100644 --- a/drivers/block/drbd/drbd_strings.c +++ b/drivers/block/drbd/drbd_strings.c @@ -1,15 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* - drbd.h - - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2003-2008, LINBIT Information Technologies GmbH. - Copyright (C) 2003-2008, Philipp Reisner . - Copyright (C) 2003-2008, Lars Ellenberg . - - -*/ + * Copyright (C) 2014, LINBIT HA-Solutions GmbH. + */ #include #include "drbd_strings.h" diff --git a/drivers/block/drbd/drbd_strings.h b/drivers/block/drbd/drbd_strings.h index 0201f6590f6a..397c2eb9b666 100644 --- a/drivers/block/drbd/drbd_strings.h +++ b/drivers/block/drbd/drbd_strings.h @@ -1,4 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2014, LINBIT HA-Solutions GmbH. + */ + #ifndef __DRBD_STRINGS_H #define __DRBD_STRINGS_H diff --git a/drivers/block/drbd/drbd_vli.h b/drivers/block/drbd/drbd_vli.h index 941c511cc4da..609a91c68a86 100644 --- a/drivers/block/drbd/drbd_vli.h +++ b/drivers/block/drbd/drbd_vli.h @@ -1,13 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* --*- linux-c -*- - drbd_receiver.c - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. - Copyright (C) 1999-2008, Philipp Reisner . - Copyright (C) 2002-2008, Lars Ellenberg . - + * Copyright (C) 1999-2008, Philipp Reisner . + * Copyright (C) 2002-2008, Lars Ellenberg . + * Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. + * Copyright (C) 2008, LINBIT HA-Solutions GmbH. */ #ifndef _DRBD_VLI_H diff --git a/include/uapi/linux/drbd.h b/include/uapi/linux/drbd.h index cf1ec3eb872f..b7d6b1c52df0 100644 --- a/include/uapi/linux/drbd.h +++ b/include/uapi/linux/drbd.h @@ -1,16 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */ /* - drbd.h - Kernel module for 2.6.x Kernels - - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. - - Copyright (C) 2001-2008, LINBIT Information Technologies GmbH. - Copyright (C) 2001-2008, Philipp Reisner . - Copyright (C) 2001-2008, Lars Ellenberg . - + * Copyright (C) 2014, LINBIT HA-Solutions GmbH. + */ -*/ #ifndef _UAPI_LINUX_DRBD_H #define _UAPI_LINUX_DRBD_H #include diff --git a/include/uapi/linux/drbd_limits.h b/include/uapi/linux/drbd_limits.h index acefe84bc602..65d3ebf2437b 100644 --- a/include/uapi/linux/drbd_limits.h +++ b/include/uapi/linux/drbd_limits.h @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* - drbd_limits.h - This file is part of DRBD by Philipp Reisner and Lars Ellenberg. -*/ + * Copyright (C) 2014, LINBIT HA-Solutions GmbH. + */ /* * Our current limitations. -- 2.55.0