aboutsummaryrefslogtreecommitdiff
path: root/fs/btrfs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-05-06 17:58:06 -0400
committerTom Rini <trini@konsulko.com>2018-05-07 09:34:12 -0400
commit83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch)
tree5e5d1b40b52aaf96b707e0da2474573306d22f7b /fs/btrfs
parent7ce85318cfff5fd82a059131761559cba7fef309 (diff)
downloadu-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.zip
u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.gz
u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.bz2
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/Makefile4
-rw-r--r--fs/btrfs/btrfs.c3
-rw-r--r--fs/btrfs/btrfs.h3
-rw-r--r--fs/btrfs/btrfs_tree.h3
-rw-r--r--fs/btrfs/chunk-map.c3
-rw-r--r--fs/btrfs/compression.c3
-rw-r--r--fs/btrfs/conv-funcs.h3
-rw-r--r--fs/btrfs/ctree.c3
-rw-r--r--fs/btrfs/ctree.h3
-rw-r--r--fs/btrfs/dev.c3
-rw-r--r--fs/btrfs/dir-item.c3
-rw-r--r--fs/btrfs/extent-io.c3
-rw-r--r--fs/btrfs/hash.c3
-rw-r--r--fs/btrfs/inode.c3
-rw-r--r--fs/btrfs/root.c3
-rw-r--r--fs/btrfs/subvolume.c3
-rw-r--r--fs/btrfs/super.c3
17 files changed, 17 insertions, 35 deletions
diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
index 0173155..9b31592 100644
--- a/fs/btrfs/Makefile
+++ b/fs/btrfs/Makefile
@@ -1,8 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-y := btrfs.o chunk-map.o compression.o ctree.o dev.o dir-item.o \
extent-io.o hash.o inode.o root.o subvolume.o super.o
diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c
index b01b111..6f35854 100644
--- a/fs/btrfs/btrfs.c
+++ b/fs/btrfs/btrfs.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include "btrfs.h"
diff --git a/fs/btrfs/btrfs.h b/fs/btrfs/btrfs.h
index 4247cbb..27d7883 100644
--- a/fs/btrfs/btrfs.h
+++ b/fs/btrfs/btrfs.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BTRFS_BTRFS_H__
diff --git a/fs/btrfs/btrfs_tree.h b/fs/btrfs/btrfs_tree.h
index f171b24..f90fbb2 100644
--- a/fs/btrfs/btrfs_tree.h
+++ b/fs/btrfs/btrfs_tree.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* From linux/include/uapi/linux/btrfs_tree.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BTRFS_BTRFS_TREE_H__
diff --git a/fs/btrfs/chunk-map.c b/fs/btrfs/chunk-map.c
index ce7330b..b3b5ef7 100644
--- a/fs/btrfs/chunk-map.c
+++ b/fs/btrfs/chunk-map.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include "btrfs.h"
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index b1b4498..e5601b8 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include "btrfs.h"
diff --git a/fs/btrfs/conv-funcs.h b/fs/btrfs/conv-funcs.h
index f2e7944..30791cd 100644
--- a/fs/btrfs/conv-funcs.h
+++ b/fs/btrfs/conv-funcs.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Functions to convert BTRFS structures from disk to CPU endianness and back.
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BTRFS_CONV_FUNCS_H__
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index c15fca3..4da36a9 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include "btrfs.h"
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 39f4473..65c152a 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* From linux/fs/btrfs/ctree.h
* Copyright (C) 2007,2008 Oracle. All rights reserved.
*
* Modified in 2017 by Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BTRFS_CTREE_H__
diff --git a/fs/btrfs/dev.c b/fs/btrfs/dev.c
index fd2e9b6..ada3800 100644
--- a/fs/btrfs/dev.c
+++ b/fs/btrfs/dev.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index 9705634..63b5bf0 100644
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include "btrfs.h"
diff --git a/fs/btrfs/extent-io.c b/fs/btrfs/extent-io.c
index feb9143..7263f41 100644
--- a/fs/btrfs/extent-io.c
+++ b/fs/btrfs/extent-io.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include "btrfs.h"
diff --git a/fs/btrfs/hash.c b/fs/btrfs/hash.c
index cde3abd..52a8cea 100644
--- a/fs/btrfs/hash.c
+++ b/fs/btrfs/hash.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include "btrfs.h"
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index f785b60..991c2f6 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include "btrfs.h"
diff --git a/fs/btrfs/root.c b/fs/btrfs/root.c
index c405813..127b67f 100644
--- a/fs/btrfs/root.c
+++ b/fs/btrfs/root.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include "btrfs.h"
diff --git a/fs/btrfs/subvolume.c b/fs/btrfs/subvolume.c
index 54e0ab45..06e54f3 100644
--- a/fs/btrfs/subvolume.c
+++ b/fs/btrfs/subvolume.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include "btrfs.h"
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 7e2528c..ad6641f 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include "btrfs.h"