Acked-by: Krzysztof Błaszkowski <kb@xxxxxxxxxxxxxxx> On Mon, 2022-05-16 at 15:38 +0200, Christoph Hellwig wrote: > When I wrote the freevxfs driver I had some odd choice of licensing > statements, the options are either GPL (without version) or an odd > BSD-ish licensense with advertising clause. > > The GPL vs always meant to be the same as the kernel, that is version > 2 only, and the odd BSD-ish license doesn't make much sense. Add > a GPL2.0-only SPDX tag to make the GPL intentions clear and drop the > bogus BSD license. > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > --- > > fs/freevxfs/vxfs.h | 27 +-------------------------- > fs/freevxfs/vxfs_bmap.c | 26 +------------------------- > fs/freevxfs/vxfs_dir.h | 27 +-------------------------- > fs/freevxfs/vxfs_extern.h | 27 +-------------------------- > fs/freevxfs/vxfs_fshead.c | 26 +------------------------- > fs/freevxfs/vxfs_fshead.h | 27 +-------------------------- > fs/freevxfs/vxfs_immed.c | 26 +------------------------- > fs/freevxfs/vxfs_inode.c | 26 +------------------------- > fs/freevxfs/vxfs_inode.h | 27 +-------------------------- > fs/freevxfs/vxfs_lookup.c | 26 +------------------------- > fs/freevxfs/vxfs_olt.c | 26 +------------------------- > fs/freevxfs/vxfs_olt.h | 27 +-------------------------- > fs/freevxfs/vxfs_subr.c | 26 +------------------------- > fs/freevxfs/vxfs_super.c | 26 +------------------------- > 14 files changed, 14 insertions(+), 356 deletions(-) > > diff --git a/fs/freevxfs/vxfs.h b/fs/freevxfs/vxfs.h > index a41ea0ba69433..bffd156d6434c 100644 > --- a/fs/freevxfs/vxfs.h > +++ b/fs/freevxfs/vxfs.h > @@ -1,32 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > * Copyright (c) 2016 Krzysztof Blaszkowski > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > - * > */ > #ifndef _VXFS_SUPER_H_ > #define _VXFS_SUPER_H_ > diff --git a/fs/freevxfs/vxfs_bmap.c b/fs/freevxfs/vxfs_bmap.c > index 1fd41cf98b9fc..de2a5bccb9307 100644 > --- a/fs/freevxfs/vxfs_bmap.c > +++ b/fs/freevxfs/vxfs_bmap.c > @@ -1,30 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > */ > > /* > diff --git a/fs/freevxfs/vxfs_dir.h b/fs/freevxfs/vxfs_dir.h > index acc5477b3f232..fbcd603365ad6 100644 > --- a/fs/freevxfs/vxfs_dir.h > +++ b/fs/freevxfs/vxfs_dir.h > @@ -1,31 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > - * > */ > #ifndef _VXFS_DIR_H_ > #define _VXFS_DIR_H_ > diff --git a/fs/freevxfs/vxfs_extern.h b/fs/freevxfs/vxfs_extern.h > index f5c428e210245..3a2180c5e208d 100644 > --- a/fs/freevxfs/vxfs_extern.h > +++ b/fs/freevxfs/vxfs_extern.h > @@ -1,31 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > - * > */ > #ifndef _VXFS_EXTERN_H_ > #define _VXFS_EXTERN_H_ > diff --git a/fs/freevxfs/vxfs_fshead.c b/fs/freevxfs/vxfs_fshead.c > index a4610a77649e5..c1174a3f89905 100644 > --- a/fs/freevxfs/vxfs_fshead.c > +++ b/fs/freevxfs/vxfs_fshead.c > @@ -1,31 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > * Copyright (c) 2016 Krzysztof Blaszkowski > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > */ > > /* > diff --git a/fs/freevxfs/vxfs_fshead.h b/fs/freevxfs/vxfs_fshead.h > index e026f0c491596..dfd2147599c49 100644 > --- a/fs/freevxfs/vxfs_fshead.h > +++ b/fs/freevxfs/vxfs_fshead.h > @@ -1,32 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > * Copyright (c) 2016 Krzysztof Blaszkowski > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > - * > */ > #ifndef _VXFS_FSHEAD_H_ > #define _VXFS_FSHEAD_H_ > diff --git a/fs/freevxfs/vxfs_immed.c b/fs/freevxfs/vxfs_immed.c > index bfc780c682fb8..334822dd8dbef 100644 > --- a/fs/freevxfs/vxfs_immed.c > +++ b/fs/freevxfs/vxfs_immed.c > @@ -1,30 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > */ > > /* > diff --git a/fs/freevxfs/vxfs_inode.c b/fs/freevxfs/vxfs_inode.c > index 1f41b25ef38b2..ceb6a12649ba6 100644 > --- a/fs/freevxfs/vxfs_inode.c > +++ b/fs/freevxfs/vxfs_inode.c > @@ -1,31 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > * Copyright (c) 2016 Krzysztof Blaszkowski > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > */ > > /* > diff --git a/fs/freevxfs/vxfs_inode.h b/fs/freevxfs/vxfs_inode.h > index f012abed125d6..1e9e138d2b338 100644 > --- a/fs/freevxfs/vxfs_inode.h > +++ b/fs/freevxfs/vxfs_inode.h > @@ -1,32 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > * Copyright (c) 2016 Krzysztof Blaszkowski > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > - * > */ > #ifndef _VXFS_INODE_H_ > #define _VXFS_INODE_H_ > diff --git a/fs/freevxfs/vxfs_lookup.c b/fs/freevxfs/vxfs_lookup.c > index a51425634f659..f04ba2ed1e1aa 100644 > --- a/fs/freevxfs/vxfs_lookup.c > +++ b/fs/freevxfs/vxfs_lookup.c > @@ -1,31 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > * Copyright (c) 2016 Krzysztof Blaszkowski > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > */ > > /* > diff --git a/fs/freevxfs/vxfs_olt.c b/fs/freevxfs/vxfs_olt.c > index 813da66851510..23f35187c2896 100644 > --- a/fs/freevxfs/vxfs_olt.c > +++ b/fs/freevxfs/vxfs_olt.c > @@ -1,30 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > */ > > /* > diff --git a/fs/freevxfs/vxfs_olt.h b/fs/freevxfs/vxfs_olt.h > index 0c0b0c9fa5579..53afba08d617f 100644 > --- a/fs/freevxfs/vxfs_olt.h > +++ b/fs/freevxfs/vxfs_olt.h > @@ -1,31 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > - * > */ > #ifndef _VXFS_OLT_H_ > #define _VXFS_OLT_H_ > diff --git a/fs/freevxfs/vxfs_subr.c b/fs/freevxfs/vxfs_subr.c > index e806694d4145e..ae19e315788d3 100644 > --- a/fs/freevxfs/vxfs_subr.c > +++ b/fs/freevxfs/vxfs_subr.c > @@ -1,30 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > */ > > /* > diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c > index 22eed5a73ac24..c3b82f716f9a7 100644 > --- a/fs/freevxfs/vxfs_super.c > +++ b/fs/freevxfs/vxfs_super.c > @@ -1,31 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2000-2001 Christoph Hellwig. > * Copyright (c) 2016 Krzysztof Blaszkowski > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or > without > - * modification, are permitted provided that the following > conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions, and the following disclaimer, > - * without modification. > - * 2. The name of the author may not be used to endorse or promote > products > - * derived from this software without specific prior written > permission. > - * > - * Alternatively, this software may be distributed under the terms > of the > - * GNU General Public License ("GPL"). > - * > - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE FOR > - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > - * SUCH DAMAGE. > */ > > /* -- Krzysztof Blaszkowski