diff options
author | David Sterba <dsterba@suse.com> | 2018-04-03 13:16:55 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-04-12 10:29:46 -0400 |
commit | 9888c3402c8567a977de37f61e9dd87792723064 (patch) | |
tree | fee4ddbd585f4996612dcf8e93088ec2901fe490 | |
parent | 471d557afed155b85da237ec46c549f443eeb5de (diff) |
btrfs: replace GPL boilerplate by SPDX -- headers
Remove GPL boilerplate text (long, short, one-line) and keep the rest,
ie. personal, company or original source copyright statements. Add the
SPDX header.
Unify the include protection macros to match the file names.
Signed-off-by: David Sterba <dsterba@suse.com>
35 files changed, 133 insertions, 475 deletions
diff --git a/fs/btrfs/async-thread.h b/fs/btrfs/async-thread.h index fc957e00cef1..7861c9feba5f 100644 --- a/fs/btrfs/async-thread.h +++ b/fs/btrfs/async-thread.h | |||
@@ -1,24 +1,12 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2007 Oracle. All rights reserved. | 3 | * Copyright (C) 2007 Oracle. All rights reserved. |
3 | * Copyright (C) 2014 Fujitsu. All rights reserved. | 4 | * Copyright (C) 2014 Fujitsu. All rights reserved. |
4 | * | ||
5 | * This program is free software; you can redistribute it and/or | ||
6 | * modify it under the terms of the GNU General Public | ||
7 | * License v2 as published by the Free Software Foundation. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
12 | * General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public | ||
15 | * License along with this program; if not, write to the | ||
16 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
17 | * Boston, MA 021110-1307, USA. | ||
18 | */ | 5 | */ |
19 | 6 | ||
20 | #ifndef __BTRFS_ASYNC_THREAD_ | 7 | #ifndef BTRFS_ASYNC_THREAD_H |
21 | #define __BTRFS_ASYNC_THREAD_ | 8 | #define BTRFS_ASYNC_THREAD_H |
9 | |||
22 | #include <linux/workqueue.h> | 10 | #include <linux/workqueue.h> |
23 | 11 | ||
24 | struct btrfs_fs_info; | 12 | struct btrfs_fs_info; |
@@ -85,4 +73,5 @@ void btrfs_set_work_high_priority(struct btrfs_work *work); | |||
85 | struct btrfs_fs_info *btrfs_work_owner(const struct btrfs_work *work); | 73 | struct btrfs_fs_info *btrfs_work_owner(const struct btrfs_work *work); |
86 | struct btrfs_fs_info *btrfs_workqueue_owner(const struct __btrfs_workqueue *wq); | 74 | struct btrfs_fs_info *btrfs_workqueue_owner(const struct __btrfs_workqueue *wq); |
87 | bool btrfs_workqueue_normal_congested(const struct btrfs_workqueue *wq); | 75 | bool btrfs_workqueue_normal_congested(const struct btrfs_workqueue *wq); |
76 | |||
88 | #endif | 77 | #endif |
diff --git a/fs/btrfs/backref.h b/fs/btrfs/backref.h index 0a30028d5196..54d58988483a 100644 --- a/fs/btrfs/backref.h +++ b/fs/btrfs/backref.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2011 STRATO. All rights reserved. | 3 | * Copyright (C) 2011 STRATO. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_BACKREF__ | 6 | #ifndef BTRFS_BACKREF_H |
20 | #define __BTRFS_BACKREF__ | 7 | #define BTRFS_BACKREF_H |
21 | 8 | ||
22 | #include <linux/btrfs.h> | 9 | #include <linux/btrfs.h> |
23 | #include "ulist.h" | 10 | #include "ulist.h" |
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index ca15be569d69..234bae55b85d 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2007 Oracle. All rights reserved. | 3 | * Copyright (C) 2007 Oracle. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_I__ | 6 | #ifndef BTRFS_INODE_H |
20 | #define __BTRFS_I__ | 7 | #define BTRFS_INODE_H |
21 | 8 | ||
22 | #include <linux/hash.h> | 9 | #include <linux/hash.h> |
23 | #include "extent_map.h" | 10 | #include "extent_map.h" |
diff --git a/fs/btrfs/check-integrity.h b/fs/btrfs/check-integrity.h index 2de58a99ee92..9bf4359cc44c 100644 --- a/fs/btrfs/check-integrity.h +++ b/fs/btrfs/check-integrity.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) STRATO AG 2011. All rights reserved. | 3 | * Copyright (C) STRATO AG 2011. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #if !defined(__BTRFS_CHECK_INTEGRITY__) | 6 | #ifndef BTRFS_CHECK_INTEGRITY_H |
20 | #define __BTRFS_CHECK_INTEGRITY__ | 7 | #define BTRFS_CHECK_INTEGRITY_H |
21 | 8 | ||
22 | #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY | 9 | #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY |
23 | int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh); | 10 | int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh); |
diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h index ce796557a918..cc605f7b23fb 100644 --- a/fs/btrfs/compression.h +++ b/fs/btrfs/compression.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2008 Oracle. All rights reserved. | 3 | * Copyright (C) 2008 Oracle. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_COMPRESSION_ | 6 | #ifndef BTRFS_COMPRESSION_H |
20 | #define __BTRFS_COMPRESSION_ | 7 | #define BTRFS_COMPRESSION_H |
21 | 8 | ||
22 | /* | 9 | /* |
23 | * We want to make sure that amount of RAM required to uncompress an extent is | 10 | * We want to make sure that amount of RAM required to uncompress an extent is |
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 0eb55825862a..5474ef14d6e6 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2007 Oracle. All rights reserved. | 3 | * Copyright (C) 2007 Oracle. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_CTREE__ | 6 | #ifndef BTRFS_CTREE_H |
20 | #define __BTRFS_CTREE__ | 7 | #define BTRFS_CTREE_H |
21 | 8 | ||
22 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
23 | #include <linux/sched/signal.h> | 10 | #include <linux/sched/signal.h> |
@@ -3752,4 +3739,5 @@ static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info) | |||
3752 | #endif | 3739 | #endif |
3753 | return 0; | 3740 | return 0; |
3754 | } | 3741 | } |
3742 | |||
3755 | #endif | 3743 | #endif |
diff --git a/fs/btrfs/dedupe.h b/fs/btrfs/dedupe.h index 83ebfe28da9e..90281a7a35a8 100644 --- a/fs/btrfs/dedupe.h +++ b/fs/btrfs/dedupe.h | |||
@@ -1,24 +1,12 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2016 Fujitsu. All rights reserved. | 3 | * Copyright (C) 2016 Fujitsu. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_DEDUPE__ | 6 | #ifndef BTRFS_DEDUPE_H |
20 | #define __BTRFS_DEDUPE__ | 7 | #define BTRFS_DEDUPE_H |
21 | 8 | ||
22 | /* later in-band dedupe will expand this struct */ | 9 | /* later in-band dedupe will expand this struct */ |
23 | struct btrfs_dedupe_hash; | 10 | struct btrfs_dedupe_hash; |
11 | |||
24 | #endif | 12 | #endif |
diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h index 100a91e26b55..ca7a97f3ab6b 100644 --- a/fs/btrfs/delayed-inode.h +++ b/fs/btrfs/delayed-inode.h | |||
@@ -1,24 +1,11 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2011 Fujitsu. All rights reserved. | 3 | * Copyright (C) 2011 Fujitsu. All rights reserved. |
3 | * Written by Miao Xie <miaox@cn.fujitsu.com> | 4 | * Written by Miao Xie <miaox@cn.fujitsu.com> |
4 | * | ||
5 | * This program is free software; you can redistribute it and/or | ||
6 | * modify it under the terms of the GNU General Public | ||
7 | * License v2 as published by the Free Software Foundation. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
12 | * General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public | ||
15 | * License along with this program; if not, write to the | ||
16 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
17 | * Boston, MA 021110-1307, USA. | ||
18 | */ | 5 | */ |
19 | 6 | ||
20 | #ifndef __DELAYED_TREE_OPERATION_H | 7 | #ifndef BTRFS_DELAYED_INODE_H |
21 | #define __DELAYED_TREE_OPERATION_H | 8 | #define BTRFS_DELAYED_INODE_H |
22 | 9 | ||
23 | #include <linux/rbtree.h> | 10 | #include <linux/rbtree.h> |
24 | #include <linux/spinlock.h> | 11 | #include <linux/spinlock.h> |
diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h index 9e3e5aff0937..741869dbc316 100644 --- a/fs/btrfs/delayed-ref.h +++ b/fs/btrfs/delayed-ref.h | |||
@@ -1,22 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2008 Oracle. All rights reserved. | 3 | * Copyright (C) 2008 Oracle. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | #ifndef __DELAYED_REF__ | 5 | |
19 | #define __DELAYED_REF__ | 6 | #ifndef BTRFS_DELAYED_REF_H |
7 | #define BTRFS_DELAYED_REF_H | ||
20 | 8 | ||
21 | #include <linux/refcount.h> | 9 | #include <linux/refcount.h> |
22 | 10 | ||
@@ -298,4 +286,5 @@ btrfs_delayed_node_to_data_ref(struct btrfs_delayed_ref_node *node) | |||
298 | { | 286 | { |
299 | return container_of(node, struct btrfs_delayed_data_ref, node); | 287 | return container_of(node, struct btrfs_delayed_data_ref, node); |
300 | } | 288 | } |
289 | |||
301 | #endif | 290 | #endif |
diff --git a/fs/btrfs/dev-replace.h b/fs/btrfs/dev-replace.h index 8566a02ef222..b6d4206188bb 100644 --- a/fs/btrfs/dev-replace.h +++ b/fs/btrfs/dev-replace.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) STRATO AG 2012. All rights reserved. | 3 | * Copyright (C) STRATO AG 2012. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #if !defined(__BTRFS_DEV_REPLACE__) | 6 | #ifndef BTRFS_DEV_REPLACE_H |
20 | #define __BTRFS_DEV_REPLACE__ | 7 | #define BTRFS_DEV_REPLACE_H |
21 | 8 | ||
22 | struct btrfs_ioctl_dev_replace_args; | 9 | struct btrfs_ioctl_dev_replace_args; |
23 | 10 | ||
@@ -48,4 +35,5 @@ static inline void btrfs_dev_replace_stats_inc(atomic64_t *stat_value) | |||
48 | { | 35 | { |
49 | atomic64_inc(stat_value); | 36 | atomic64_inc(stat_value); |
50 | } | 37 | } |
38 | |||
51 | #endif | 39 | #endif |
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index 453ea9f5d4e9..1a3d277b027b 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2007 Oracle. All rights reserved. | 3 | * Copyright (C) 2007 Oracle. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __DISKIO__ | 6 | #ifndef BTRFS_DISK_IO_H |
20 | #define __DISKIO__ | 7 | #define BTRFS_DISK_IO_H |
21 | 8 | ||
22 | #define BTRFS_SUPER_INFO_OFFSET SZ_64K | 9 | #define BTRFS_SUPER_INFO_OFFSET SZ_64K |
23 | #define BTRFS_SUPER_INFO_SIZE 4096 | 10 | #define BTRFS_SUPER_INFO_SIZE 4096 |
@@ -169,4 +156,5 @@ static inline void btrfs_set_buffer_lockdep_class(u64 objectid, | |||
169 | { | 156 | { |
170 | } | 157 | } |
171 | #endif | 158 | #endif |
159 | |||
172 | #endif | 160 | #endif |
diff --git a/fs/btrfs/export.h b/fs/btrfs/export.h index 91b3908e7c54..57488ecd7d4e 100644 --- a/fs/btrfs/export.h +++ b/fs/btrfs/export.h | |||
@@ -1,4 +1,5 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | 1 | /* SPDX-License-Identifier: GPL-2.0 */ |
2 | |||
2 | #ifndef BTRFS_EXPORT_H | 3 | #ifndef BTRFS_EXPORT_H |
3 | #define BTRFS_EXPORT_H | 4 | #define BTRFS_EXPORT_H |
4 | 5 | ||
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index b77d84909863..a53009694b16 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h | |||
@@ -1,6 +1,7 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | 1 | /* SPDX-License-Identifier: GPL-2.0 */ |
2 | #ifndef __EXTENTIO__ | 2 | |
3 | #define __EXTENTIO__ | 3 | #ifndef BTRFS_EXTENT_IO_H |
4 | #define BTRFS_EXTENT_IO_H | ||
4 | 5 | ||
5 | #include <linux/rbtree.h> | 6 | #include <linux/rbtree.h> |
6 | #include <linux/refcount.h> | 7 | #include <linux/refcount.h> |
@@ -572,4 +573,5 @@ noinline u64 find_lock_delalloc_range(struct inode *inode, | |||
572 | #endif | 573 | #endif |
573 | struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info, | 574 | struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info, |
574 | u64 start); | 575 | u64 start); |
576 | |||
575 | #endif | 577 | #endif |
diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h index f6f8ba114977..5fcb80a6ce37 100644 --- a/fs/btrfs/extent_map.h +++ b/fs/btrfs/extent_map.h | |||
@@ -1,6 +1,7 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | 1 | /* SPDX-License-Identifier: GPL-2.0 */ |
2 | #ifndef __EXTENTMAP__ | 2 | |
3 | #define __EXTENTMAP__ | 3 | #ifndef BTRFS_EXTENT_MAP_H |
4 | #define BTRFS_EXTENT_MAP_H | ||
4 | 5 | ||
5 | #include <linux/rbtree.h> | 6 | #include <linux/rbtree.h> |
6 | #include <linux/refcount.h> | 7 | #include <linux/refcount.h> |
@@ -93,4 +94,5 @@ struct extent_map *search_extent_mapping(struct extent_map_tree *tree, | |||
93 | u64 start, u64 len); | 94 | u64 start, u64 len); |
94 | int btrfs_add_extent_mapping(struct extent_map_tree *em_tree, | 95 | int btrfs_add_extent_mapping(struct extent_map_tree *em_tree, |
95 | struct extent_map **em_in, u64 start, u64 len); | 96 | struct extent_map **em_in, u64 start, u64 len); |
97 | |||
96 | #endif | 98 | #endif |
diff --git a/fs/btrfs/free-space-cache.h b/fs/btrfs/free-space-cache.h index 79eca4cabb1c..15e30b93db0d 100644 --- a/fs/btrfs/free-space-cache.h +++ b/fs/btrfs/free-space-cache.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2009 Oracle. All rights reserved. | 3 | * Copyright (C) 2009 Oracle. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_FREE_SPACE_CACHE | 6 | #ifndef BTRFS_FREE_SPACE_CACHE_H |
20 | #define __BTRFS_FREE_SPACE_CACHE | 7 | #define BTRFS_FREE_SPACE_CACHE_H |
21 | 8 | ||
22 | struct btrfs_free_space { | 9 | struct btrfs_free_space { |
23 | struct rb_node offset_index; | 10 | struct rb_node offset_index; |
diff --git a/fs/btrfs/free-space-tree.h b/fs/btrfs/free-space-tree.h index ba3787df43c3..874b4feecad2 100644 --- a/fs/btrfs/free-space-tree.h +++ b/fs/btrfs/free-space-tree.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2015 Facebook. All rights reserved. | 3 | * Copyright (C) 2015 Facebook. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_FREE_SPACE_TREE | 6 | #ifndef BTRFS_FREE_SPACE_TREE_H |
20 | #define __BTRFS_FREE_SPACE_TREE | 7 | #define BTRFS_FREE_SPACE_TREE_H |
21 | 8 | ||
22 | /* | 9 | /* |
23 | * The default size for new free space bitmap items. The last bitmap in a block | 10 | * The default size for new free space bitmap items. The last bitmap in a block |
diff --git a/fs/btrfs/inode-map.h b/fs/btrfs/inode-map.h index 6734ec92a1e9..7a962811dffe 100644 --- a/fs/btrfs/inode-map.h +++ b/fs/btrfs/inode-map.h | |||
@@ -1,6 +1,7 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | 1 | /* SPDX-License-Identifier: GPL-2.0 */ |
2 | #ifndef __BTRFS_INODE_MAP | 2 | |
3 | #define __BTRFS_INODE_MAP | 3 | #ifndef BTRFS_INODE_MAP_H |
4 | #define BTRFS_INODE_MAP_H | ||
4 | 5 | ||
5 | void btrfs_init_free_ino_ctl(struct btrfs_root *root); | 6 | void btrfs_init_free_ino_ctl(struct btrfs_root *root); |
6 | void btrfs_unpin_free_ino(struct btrfs_root *root); | 7 | void btrfs_unpin_free_ino(struct btrfs_root *root); |
diff --git a/fs/btrfs/locking.h b/fs/btrfs/locking.h index c44a9d5f5362..29135def468e 100644 --- a/fs/btrfs/locking.h +++ b/fs/btrfs/locking.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2008 Oracle. All rights reserved. | 3 | * Copyright (C) 2008 Oracle. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_LOCKING_ | 6 | #ifndef BTRFS_LOCKING_H |
20 | #define __BTRFS_LOCKING_ | 7 | #define BTRFS_LOCKING_H |
21 | 8 | ||
22 | #define BTRFS_WRITE_LOCK 1 | 9 | #define BTRFS_WRITE_LOCK 1 |
23 | #define BTRFS_READ_LOCK 2 | 10 | #define BTRFS_READ_LOCK 2 |
diff --git a/fs/btrfs/math.h b/fs/btrfs/math.h index 1b10a3cd1195..75246f2f56ba 100644 --- a/fs/btrfs/math.h +++ b/fs/btrfs/math.h | |||
@@ -1,25 +1,11 @@ | |||
1 | 1 | /* SPDX-License-Identifier: GPL-2.0 */ | |
2 | /* | 2 | /* |
3 | * Copyright (C) 2012 Fujitsu. All rights reserved. | 3 | * Copyright (C) 2012 Fujitsu. All rights reserved. |
4 | * Written by Miao Xie <miaox@cn.fujitsu.com> | 4 | * Written by Miao Xie <miaox@cn.fujitsu.com> |
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public | ||
8 | * License v2 as published by the Free Software Foundation. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | * General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public | ||
16 | * License along with this program; if not, write to the | ||
17 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
18 | * Boston, MA 021110-1307, USA. | ||
19 | */ | 5 | */ |
20 | 6 | ||
21 | #ifndef __BTRFS_MATH_H | 7 | #ifndef BTRFS_MATH_H |
22 | #define __BTRFS_MATH_H | 8 | #define BTRFS_MATH_H |
23 | 9 | ||
24 | #include <asm/div64.h> | 10 | #include <asm/div64.h> |
25 | 11 | ||
diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h index 4a1672a13ba6..3be443fb3001 100644 --- a/fs/btrfs/ordered-data.h +++ b/fs/btrfs/ordered-data.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2007 Oracle. All rights reserved. | 3 | * Copyright (C) 2007 Oracle. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_ORDERED_DATA__ | 6 | #ifndef BTRFS_ORDERED_DATA_H |
20 | #define __BTRFS_ORDERED_DATA__ | 7 | #define BTRFS_ORDERED_DATA_H |
21 | 8 | ||
22 | /* one of these per inode */ | 9 | /* one of these per inode */ |
23 | struct btrfs_ordered_inode_tree { | 10 | struct btrfs_ordered_inode_tree { |
@@ -218,4 +205,5 @@ void btrfs_wait_logged_extents(struct btrfs_trans_handle *trans, | |||
218 | void btrfs_free_logged_extents(struct btrfs_root *log, u64 transid); | 205 | void btrfs_free_logged_extents(struct btrfs_root *log, u64 transid); |
219 | int __init ordered_data_init(void); | 206 | int __init ordered_data_init(void); |
220 | void __cold ordered_data_exit(void); | 207 | void __cold ordered_data_exit(void); |
208 | |||
221 | #endif | 209 | #endif |
diff --git a/fs/btrfs/print-tree.h b/fs/btrfs/print-tree.h index 3afd508ed8c5..4a98481688f4 100644 --- a/fs/btrfs/print-tree.h +++ b/fs/btrfs/print-tree.h | |||
@@ -1,23 +1,12 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2007 Oracle. All rights reserved. | 3 | * Copyright (C) 2007 Oracle. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __PRINT_TREE_ | 6 | #ifndef BTRFS_PRINT_TREE_H |
20 | #define __PRINT_TREE_ | 7 | #define BTRFS_PRINT_TREE_H |
8 | |||
21 | void btrfs_print_leaf(struct extent_buffer *l); | 9 | void btrfs_print_leaf(struct extent_buffer *l); |
22 | void btrfs_print_tree(struct extent_buffer *c); | 10 | void btrfs_print_tree(struct extent_buffer *c); |
11 | |||
23 | #endif | 12 | #endif |
diff --git a/fs/btrfs/props.h b/fs/btrfs/props.h index 100f18829d50..618815b4f9d5 100644 --- a/fs/btrfs/props.h +++ b/fs/btrfs/props.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2014 Filipe David Borba Manana <fdmanana@gmail.com> | 3 | * Copyright (C) 2014 Filipe David Borba Manana <fdmanana@gmail.com> |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_PROPS_H | 6 | #ifndef BTRFS_PROPS_H |
20 | #define __BTRFS_PROPS_H | 7 | #define BTRFS_PROPS_H |
21 | 8 | ||
22 | #include "ctree.h" | 9 | #include "ctree.h" |
23 | 10 | ||
diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h index e63e2d497a8e..d60dd06445ce 100644 --- a/fs/btrfs/qgroup.h +++ b/fs/btrfs/qgroup.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2014 Facebook. All rights reserved. | 3 | * Copyright (C) 2014 Facebook. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_QGROUP__ | 6 | #ifndef BTRFS_QGROUP_H |
20 | #define __BTRFS_QGROUP__ | 7 | #define BTRFS_QGROUP_H |
21 | 8 | ||
22 | #include "ulist.h" | 9 | #include "ulist.h" |
23 | #include "delayed-ref.h" | 10 | #include "delayed-ref.h" |
@@ -341,4 +328,5 @@ void btrfs_qgroup_free_meta_all_pertrans(struct btrfs_root *root); | |||
341 | void btrfs_qgroup_convert_reserved_meta(struct btrfs_root *root, int num_bytes); | 328 | void btrfs_qgroup_convert_reserved_meta(struct btrfs_root *root, int num_bytes); |
342 | 329 | ||
343 | void btrfs_qgroup_check_reserved_leak(struct inode *inode); | 330 | void btrfs_qgroup_check_reserved_leak(struct inode *inode); |
344 | #endif /* __BTRFS_QGROUP__ */ | 331 | |
332 | #endif | ||
diff --git a/fs/btrfs/raid56.h b/fs/btrfs/raid56.h index 4ee4fe346838..f5d4c13a8dbc 100644 --- a/fs/btrfs/raid56.h +++ b/fs/btrfs/raid56.h | |||
@@ -1,24 +1,12 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2012 Fusion-io All rights reserved. | 3 | * Copyright (C) 2012 Fusion-io All rights reserved. |
3 | * Copyright (C) 2012 Intel Corp. All rights reserved. | 4 | * Copyright (C) 2012 Intel Corp. All rights reserved. |
4 | * | ||
5 | * This program is free software; you can redistribute it and/or | ||
6 | * modify it under the terms of the GNU General Public | ||
7 | * License v2 as published by the Free Software Foundation. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
12 | * General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public | ||
15 | * License along with this program; if not, write to the | ||
16 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
17 | * Boston, MA 021110-1307, USA. | ||
18 | */ | 5 | */ |
19 | 6 | ||
20 | #ifndef __BTRFS_RAID56__ | 7 | #ifndef BTRFS_RAID56_H |
21 | #define __BTRFS_RAID56__ | 8 | #define BTRFS_RAID56_H |
9 | |||
22 | static inline int nr_parity_stripes(struct map_lookup *map) | 10 | static inline int nr_parity_stripes(struct map_lookup *map) |
23 | { | 11 | { |
24 | if (map->type & BTRFS_BLOCK_GROUP_RAID5) | 12 | if (map->type & BTRFS_BLOCK_GROUP_RAID5) |
@@ -65,4 +53,5 @@ void raid56_submit_missing_rbio(struct btrfs_raid_bio *rbio); | |||
65 | 53 | ||
66 | int btrfs_alloc_stripe_hash_table(struct btrfs_fs_info *info); | 54 | int btrfs_alloc_stripe_hash_table(struct btrfs_fs_info *info); |
67 | void btrfs_free_stripe_hash_table(struct btrfs_fs_info *info); | 55 | void btrfs_free_stripe_hash_table(struct btrfs_fs_info *info); |
56 | |||
68 | #endif | 57 | #endif |
diff --git a/fs/btrfs/rcu-string.h b/fs/btrfs/rcu-string.h index 9e111e4576d4..a97dc74a4d3d 100644 --- a/fs/btrfs/rcu-string.h +++ b/fs/btrfs/rcu-string.h | |||
@@ -1,21 +1,11 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2012 Red Hat. All rights reserved. | 3 | * Copyright (C) 2012 Red Hat. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
6 | #ifndef BTRFS_RCU_STRING_H | ||
7 | #define BTRFS_RCU_STRING_H | ||
8 | |||
19 | struct rcu_string { | 9 | struct rcu_string { |
20 | struct rcu_head rcu; | 10 | struct rcu_head rcu; |
21 | char str[0]; | 11 | char str[0]; |
@@ -54,3 +44,5 @@ static inline void rcu_string_free(struct rcu_string *str) | |||
54 | struct rcu_string *__str = rcu_dereference(rcu_str); \ | 44 | struct rcu_string *__str = rcu_dereference(rcu_str); \ |
55 | __str->str; \ | 45 | __str->str; \ |
56 | }) | 46 | }) |
47 | |||
48 | #endif | ||
diff --git a/fs/btrfs/ref-verify.h b/fs/btrfs/ref-verify.h index 3bf02ce0e1e2..b7d2a4edfdb7 100644 --- a/fs/btrfs/ref-verify.h +++ b/fs/btrfs/ref-verify.h | |||
@@ -1,22 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2014 Facebook. All rights reserved. | 3 | * Copyright (C) 2014 Facebook. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | #ifndef __REF_VERIFY__ | 5 | |
19 | #define __REF_VERIFY__ | 6 | #ifndef BTRFS_REF_VERIFY_H |
7 | #define BTRFS_REF_VERIFY_H | ||
20 | 8 | ||
21 | #ifdef CONFIG_BTRFS_FS_REF_VERIFY | 9 | #ifdef CONFIG_BTRFS_FS_REF_VERIFY |
22 | int btrfs_build_ref_tree(struct btrfs_fs_info *fs_info); | 10 | int btrfs_build_ref_tree(struct btrfs_fs_info *fs_info); |
@@ -59,4 +47,5 @@ static inline void btrfs_init_ref_verify(struct btrfs_fs_info *fs_info) | |||
59 | } | 47 | } |
60 | 48 | ||
61 | #endif /* CONFIG_BTRFS_FS_REF_VERIFY */ | 49 | #endif /* CONFIG_BTRFS_FS_REF_VERIFY */ |
62 | #endif /* _REF_VERIFY__ */ | 50 | |
51 | #endif | ||
diff --git a/fs/btrfs/send.h b/fs/btrfs/send.h index 3aa4bc55754f..ead397f7034f 100644 --- a/fs/btrfs/send.h +++ b/fs/btrfs/send.h | |||
@@ -1,22 +1,12 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2012 Alexander Block. All rights reserved. | 3 | * Copyright (C) 2012 Alexander Block. All rights reserved. |
3 | * Copyright (C) 2012 STRATO. All rights reserved. | 4 | * Copyright (C) 2012 STRATO. All rights reserved. |
4 | * | ||
5 | * This program is free software; you can redistribute it and/or | ||
6 | * modify it under the terms of the GNU General Public | ||
7 | * License v2 as published by the Free Software Foundation. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
12 | * General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public | ||
15 | * License along with this program; if not, write to the | ||
16 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
17 | * Boston, MA 021110-1307, USA. | ||
18 | */ | 5 | */ |
19 | 6 | ||
7 | #ifndef BTRFS_SEND_H | ||
8 | #define BTRFS_SEND_H | ||
9 | |||
20 | #include "ctree.h" | 10 | #include "ctree.h" |
21 | 11 | ||
22 | #define BTRFS_SEND_STREAM_MAGIC "btrfs-stream" | 12 | #define BTRFS_SEND_STREAM_MAGIC "btrfs-stream" |
@@ -132,3 +122,5 @@ enum { | |||
132 | #ifdef __KERNEL__ | 122 | #ifdef __KERNEL__ |
133 | long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg); | 123 | long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg); |
134 | #endif | 124 | #endif |
125 | |||
126 | #endif | ||
diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h index 80457f31c29f..b567560d9aa9 100644 --- a/fs/btrfs/sysfs.h +++ b/fs/btrfs/sysfs.h | |||
@@ -1,6 +1,7 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | 1 | /* SPDX-License-Identifier: GPL-2.0 */ |
2 | #ifndef _BTRFS_SYSFS_H_ | 2 | |
3 | #define _BTRFS_SYSFS_H_ | 3 | #ifndef BTRFS_SYSFS_H |
4 | #define BTRFS_SYSFS_H | ||
4 | 5 | ||
5 | /* | 6 | /* |
6 | * Data exported through sysfs | 7 | * Data exported through sysfs |
@@ -90,4 +91,4 @@ void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs); | |||
90 | void btrfs_sysfs_feature_update(struct btrfs_fs_info *fs_info, | 91 | void btrfs_sysfs_feature_update(struct btrfs_fs_info *fs_info, |
91 | u64 bit, enum btrfs_feature_set set); | 92 | u64 bit, enum btrfs_feature_set set); |
92 | 93 | ||
93 | #endif /* _BTRFS_SYSFS_H_ */ | 94 | #endif |
diff --git a/fs/btrfs/tests/btrfs-tests.h b/fs/btrfs/tests/btrfs-tests.h index bc0615bac3cc..a5a0b9500d3e 100644 --- a/fs/btrfs/tests/btrfs-tests.h +++ b/fs/btrfs/tests/btrfs-tests.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2013 Fusion IO. All rights reserved. | 3 | * Copyright (C) 2013 Fusion IO. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_TESTS | 6 | #ifndef BTRFS_TESTS_H |
20 | #define __BTRFS_TESTS | 7 | #define BTRFS_TESTS_H |
21 | 8 | ||
22 | #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS | 9 | #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS |
23 | int btrfs_run_sanity_tests(void); | 10 | int btrfs_run_sanity_tests(void); |
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h index b6c94ce33503..c88fccd80bc5 100644 --- a/fs/btrfs/transaction.h +++ b/fs/btrfs/transaction.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2007 Oracle. All rights reserved. | 3 | * Copyright (C) 2007 Oracle. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_TRANSACTION__ | 6 | #ifndef BTRFS_TRANSACTION_H |
20 | #define __BTRFS_TRANSACTION__ | 7 | #define BTRFS_TRANSACTION_H |
21 | 8 | ||
22 | #include <linux/refcount.h> | 9 | #include <linux/refcount.h> |
23 | #include "btrfs_inode.h" | 10 | #include "btrfs_inode.h" |
@@ -228,4 +215,5 @@ void btrfs_put_transaction(struct btrfs_transaction *transaction); | |||
228 | void btrfs_apply_pending_changes(struct btrfs_fs_info *fs_info); | 215 | void btrfs_apply_pending_changes(struct btrfs_fs_info *fs_info); |
229 | void btrfs_add_dropped_root(struct btrfs_trans_handle *trans, | 216 | void btrfs_add_dropped_root(struct btrfs_trans_handle *trans, |
230 | struct btrfs_root *root); | 217 | struct btrfs_root *root); |
218 | |||
231 | #endif | 219 | #endif |
diff --git a/fs/btrfs/tree-checker.h b/fs/btrfs/tree-checker.h index aba542755710..ff043275b784 100644 --- a/fs/btrfs/tree-checker.h +++ b/fs/btrfs/tree-checker.h | |||
@@ -1,21 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) Qu Wenruo 2017. All rights reserved. | 3 | * Copyright (C) Qu Wenruo 2017. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program. | ||
15 | */ | 4 | */ |
16 | 5 | ||
17 | #ifndef __BTRFS_TREE_CHECKER__ | 6 | #ifndef BTRFS_TREE_CHECKER_H |
18 | #define __BTRFS_TREE_CHECKER__ | 7 | #define BTRFS_TREE_CHECKER_H |
19 | 8 | ||
20 | #include "ctree.h" | 9 | #include "ctree.h" |
21 | #include "extent_io.h" | 10 | #include "extent_io.h" |
diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h index 88abc43312a1..122e68b89a5a 100644 --- a/fs/btrfs/tree-log.h +++ b/fs/btrfs/tree-log.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2008 Oracle. All rights reserved. | 3 | * Copyright (C) 2008 Oracle. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __TREE_LOG_ | 6 | #ifndef BTRFS_TREE_LOG_H |
20 | #define __TREE_LOG_ | 7 | #define BTRFS_TREE_LOG_H |
21 | 8 | ||
22 | #include "ctree.h" | 9 | #include "ctree.h" |
23 | #include "transaction.h" | 10 | #include "transaction.h" |
@@ -87,4 +74,5 @@ void btrfs_record_snapshot_destroy(struct btrfs_trans_handle *trans, | |||
87 | int btrfs_log_new_name(struct btrfs_trans_handle *trans, | 74 | int btrfs_log_new_name(struct btrfs_trans_handle *trans, |
88 | struct btrfs_inode *inode, struct btrfs_inode *old_dir, | 75 | struct btrfs_inode *inode, struct btrfs_inode *old_dir, |
89 | struct dentry *parent); | 76 | struct dentry *parent); |
77 | |||
90 | #endif | 78 | #endif |
diff --git a/fs/btrfs/ulist.h b/fs/btrfs/ulist.h index 53c913632733..02fda0a2d4ce 100644 --- a/fs/btrfs/ulist.h +++ b/fs/btrfs/ulist.h | |||
@@ -1,12 +1,11 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2011 STRATO AG | 3 | * Copyright (C) 2011 STRATO AG |
3 | * written by Arne Jansen <sensille@gmx.net> | 4 | * written by Arne Jansen <sensille@gmx.net> |
4 | * Distributed under the GNU GPL license version 2. | ||
5 | * | ||
6 | */ | 5 | */ |
7 | 6 | ||
8 | #ifndef __ULIST__ | 7 | #ifndef BTRFS_ULIST_H |
9 | #define __ULIST__ | 8 | #define BTRFS_ULIST_H |
10 | 9 | ||
11 | #include <linux/list.h> | 10 | #include <linux/list.h> |
12 | #include <linux/rbtree.h> | 11 | #include <linux/rbtree.h> |
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index d1fcaea9fef5..79096884654f 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2007 Oracle. All rights reserved. | 3 | * Copyright (C) 2007 Oracle. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __BTRFS_VOLUMES_ | 6 | #ifndef BTRFS_VOLUMES_H |
20 | #define __BTRFS_VOLUMES_ | 7 | #define BTRFS_VOLUMES_H |
21 | 8 | ||
22 | #include <linux/bio.h> | 9 | #include <linux/bio.h> |
23 | #include <linux/sort.h> | 10 | #include <linux/sort.h> |
diff --git a/fs/btrfs/xattr.h b/fs/btrfs/xattr.h index e215a3212a2a..471fcac6ff55 100644 --- a/fs/btrfs/xattr.h +++ b/fs/btrfs/xattr.h | |||
@@ -1,23 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2007 Red Hat. All rights reserved. | 3 | * Copyright (C) 2007 Red Hat. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public | ||
6 | * License v2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public | ||
14 | * License along with this program; if not, write to the | ||
15 | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
16 | * Boston, MA 021110-1307, USA. | ||
17 | */ | 4 | */ |
18 | 5 | ||
19 | #ifndef __XATTR__ | 6 | #ifndef BTRFS_XATTR_H |
20 | #define __XATTR__ | 7 | #define BTRFS_XATTR_H |
21 | 8 | ||
22 | #include <linux/xattr.h> | 9 | #include <linux/xattr.h> |
23 | 10 | ||
@@ -34,4 +21,4 @@ int btrfs_xattr_security_init(struct btrfs_trans_handle *trans, | |||
34 | struct inode *inode, struct inode *dir, | 21 | struct inode *inode, struct inode *dir, |
35 | const struct qstr *qstr); | 22 | const struct qstr *qstr); |
36 | 23 | ||
37 | #endif /* __XATTR__ */ | 24 | #endif |