Re: [PATCH 2/5] block: switch all files cleared marked as GPLv2 or later to SPDX tags

[Chaitanya Kulkarni]

Looks good.

Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx>

On 4/30/19 11:44 AM, Christoph Hellwig wrote:
> All these files have some form of the usual GPLv2 or later boilerplate.
> Switch them to use SPDX tags instead.
> 
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
>   block/bfq-cgroup.c      | 11 +----------
>   block/bfq-iosched.c     | 11 +----------
>   block/bfq-iosched.h     | 11 +----------
>   block/bfq-wf2q.c        | 11 +----------
>   block/bsg-lib.c         | 16 +---------------
>   block/partitions/efi.c  | 16 +---------------
>   block/partitions/efi.h  | 16 +---------------
>   block/partitions/ldm.c  | 16 +---------------
>   block/partitions/ldm.h  | 16 +---------------
>   include/linux/bsg-lib.h | 16 +---------------
>   10 files changed, 10 insertions(+), 130 deletions(-)
> 
> diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
> index 793c027ca60e..b3796a40a61a 100644
> --- a/block/bfq-cgroup.c
> +++ b/block/bfq-cgroup.c
> @@ -1,15 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>   /*
>    * cgroups support for the BFQ I/O scheduler.
> - *
> - *  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.
> - *
> - *  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.
>    */
>   #include <linux/module.h>
>   #include <linux/slab.h>
> diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
> index b85a4ab8b9db..f8d430f88d25 100644
> --- a/block/bfq-iosched.c
> +++ b/block/bfq-iosched.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>   /*
>    * Budget Fair Queueing (BFQ) I/O scheduler.
>    *
> @@ -12,16 +13,6 @@
>    *
>    * Copyright (C) 2017 Paolo Valente <paolo.valente@xxxxxxxxxx>
>    *
> - *  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.
> - *
> - *  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.
> - *
>    * BFQ is a proportional-share I/O scheduler, with some extra
>    * low-latency capabilities. BFQ also supports full hierarchical
>    * scheduling through cgroups. Next paragraphs provide an introduction
> diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h
> index eba7cd449ab4..c2faa77824f8 100644
> --- a/block/bfq-iosched.h
> +++ b/block/bfq-iosched.h
> @@ -1,16 +1,7 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>   /*
>    * Header file for the BFQ I/O scheduler: data structures and
>    * prototypes of interface functions among BFQ components.
> - *
> - *  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.
> - *
> - *  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.
>    */
>   #ifndef _BFQ_H
>   #define _BFQ_H
> diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
> index 48d899cfbe03..c9ba225081ce 100644
> --- a/block/bfq-wf2q.c
> +++ b/block/bfq-wf2q.c
> @@ -1,19 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>   /*
>    * Hierarchical Budget Worst-case Fair Weighted Fair Queueing
>    * (B-WF2Q+): hierarchical scheduling algorithm by which the BFQ I/O
>    * scheduler schedules generic entities. The latter can represent
>    * either single bfq queues (associated with processes) or groups of
>    * bfq queues (associated with cgroups).
> - *
> - *  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.
> - *
> - *  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.
>    */
>   #include "bfq-iosched.h"
>   
> diff --git a/block/bsg-lib.c b/block/bsg-lib.c
> index 005e2b75d775..b898a1cdf872 100644
> --- a/block/bsg-lib.c
> +++ b/block/bsg-lib.c
> @@ -1,24 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>   /*
>    *  BSG helper library
>    *
>    *  Copyright (C) 2008   James Smart, Emulex Corporation
>    *  Copyright (C) 2011   Red Hat, Inc.  All rights reserved.
>    *  Copyright (C) 2011   Mike Christie
> - *
> - *  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.
> - *
> - *  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.
> - *
> - *  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
> - *
>    */
>   #include <linux/slab.h>
>   #include <linux/blk-mq.h>
> diff --git a/block/partitions/efi.c b/block/partitions/efi.c
> index 39f70d968754..db2fef7dfc47 100644
> --- a/block/partitions/efi.c
> +++ b/block/partitions/efi.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>   /************************************************************
>    * EFI GUID Partition Table handling
>    *
> @@ -7,21 +8,6 @@
>    * efi.[ch] by Matt Domsch <Matt_Domsch@xxxxxxxx>
>    *   Copyright 2000,2001,2002,2004 Dell Inc.
>    *
> - *  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.
> - *
> - *  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.
> - *
> - *  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
> - *
> - *
>    * TODO:
>    *
>    * Changelog:
> diff --git a/block/partitions/efi.h b/block/partitions/efi.h
> index abd0b19288a6..3e8576157575 100644
> --- a/block/partitions/efi.h
> +++ b/block/partitions/efi.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>   /************************************************************
>    * EFI GUID Partition Table
>    * Per Intel EFI Specification v1.02
> @@ -5,21 +6,6 @@
>    *
>    * By Matt Domsch <Matt_Domsch@xxxxxxxx>  Fri Sep 22 22:15:56 CDT 2000
>    *   Copyright 2000,2001 Dell Inc.
> - *
> - *  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.
> - *
> - *  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.
> - *
> - *  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
> - *
>    ************************************************************/
>   
>   #ifndef FS_PART_EFI_H_INCLUDED
> diff --git a/block/partitions/ldm.c b/block/partitions/ldm.c
> index 16766f267559..6db573f33219 100644
> --- a/block/partitions/ldm.c
> +++ b/block/partitions/ldm.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>   /**
>    * ldm - Support for Windows Logical Disk Manager (Dynamic Disks)
>    *
> @@ -6,21 +7,6 @@
>    * Copyright (C) 2001,2002 Jakob Kemi <jakob.kemi@xxxxxxxxx>
>    *
>    * Documentation is available at http://www.linux-ntfs.org/doku.php?id=downloads
> - *
> - * 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.
> - *
> - * 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.
> - *
> - * You should have received a copy of the GNU General Public License along with
> - * this program (in the main directory of the source in the file COPYING); if
> - * not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
> - * Boston, MA  02111-1307  USA
>    */
>   
>   #include <linux/slab.h>
> diff --git a/block/partitions/ldm.h b/block/partitions/ldm.h
> index f4c6055df956..1ca63e97bccc 100644
> --- a/block/partitions/ldm.h
> +++ b/block/partitions/ldm.h
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>   /**
>    * ldm - Part of the Linux-NTFS project.
>    *
> @@ -6,21 +7,6 @@
>    * Copyright (C) 2001,2002 Jakob Kemi <jakob.kemi@xxxxxxxxx>
>    *
>    * Documentation is available at http://www.linux-ntfs.org/doku.php?id=downloads
> - *
> - * 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.
> - *
> - * 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.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program (in the main directory of the Linux-NTFS source
> - * in the file COPYING); if not, write to the Free Software Foundation,
> - * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>    */
>   
>   #ifndef _FS_PT_LDM_H_
> diff --git a/include/linux/bsg-lib.h b/include/linux/bsg-lib.h
> index 7f14517a559b..960988d42f77 100644
> --- a/include/linux/bsg-lib.h
> +++ b/include/linux/bsg-lib.h
> @@ -1,24 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>   /*
>    *  BSG helper library
>    *
>    *  Copyright (C) 2008   James Smart, Emulex Corporation
>    *  Copyright (C) 2011   Red Hat, Inc.  All rights reserved.
>    *  Copyright (C) 2011   Mike Christie
> - *
> - *  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.
> - *
> - *  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.
> - *
> - *  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
> - *
>    */
>   #ifndef _BLK_BSG_
>   #define _BLK_BSG_
>