Skip to content

Commit e37563b

Browse files
torvaldstorvalds
committed
Merge tag 'for-4.17-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull more btrfs updates from David Sterba: "We have queued a few more fixes (error handling, log replay, softlockup) and the rest is SPDX updates that touche almost all files so the diffstat is long" * tag 'for-4.17-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: btrfs: Only check first key for committed tree blocks btrfs: add SPDX header to Kconfig btrfs: replace GPL boilerplate by SPDX -- sources btrfs: replace GPL boilerplate by SPDX -- headers Btrfs: fix loss of prealloc extents past i_size after fsync log replay Btrfs: clean up resources during umount after trans is aborted btrfs: Fix possible softlock on single core machines Btrfs: bail out on error during replay_dir_deletes Btrfs: fix NULL pointer dereference in log_dir_items
2 parents 09c9b0e + 5d41be6 commit e37563b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+277
-1234
lines changed

‎fs/btrfs/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
13
config BTRFS_FS
24
tristate "Btrfs filesystem support"
35
select LIBCRC32C

‎fs/btrfs/acl.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* 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.
174
*/
185

196
#include <linux/fs.h>

‎fs/btrfs/async-thread.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,7 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* Copyright (C) 2007 Oracle. All rights reserved.
34
* 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.
185
*/
196

207
#include <linux/kthread.h>

‎fs/btrfs/async-thread.h

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* Copyright (C) 2007 Oracle. All rights reserved.
34
* 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.
185
*/
196

20-
#ifndef __BTRFS_ASYNC_THREAD_
21-
#define __BTRFS_ASYNC_THREAD_
7+
#ifndef BTRFS_ASYNC_THREAD_H
8+
#define BTRFS_ASYNC_THREAD_H
9+
2210
#include <linux/workqueue.h>
2311

2412
struct btrfs_fs_info;
@@ -85,4 +73,5 @@ void btrfs_set_work_high_priority(struct btrfs_work *work);
8573
struct btrfs_fs_info *btrfs_work_owner(const struct btrfs_work *work);
8674
struct btrfs_fs_info *btrfs_workqueue_owner(const struct __btrfs_workqueue *wq);
8775
bool btrfs_workqueue_normal_congested(const struct btrfs_workqueue *wq);
76+
8877
#endif

‎fs/btrfs/backref.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* 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.
174
*/
185

196
#include <linux/mm.h>

‎fs/btrfs/backref.h

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* 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.
174
*/
185

19-
#ifndef __BTRFS_BACKREF__
20-
#define __BTRFS_BACKREF__
6+
#ifndef BTRFS_BACKREF_H
7+
#define BTRFS_BACKREF_H
218

229
#include <linux/btrfs.h>
2310
#include "ulist.h"

‎fs/btrfs/btrfs_inode.h

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* 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.
174
*/
185

19-
#ifndef __BTRFS_I__
20-
#define __BTRFS_I__
6+
#ifndef BTRFS_INODE_H
7+
#define BTRFS_INODE_H
218

229
#include <linux/hash.h>
2310
#include "extent_map.h"

‎fs/btrfs/check-integrity.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* 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.
174
*/
185

196
/*

‎fs/btrfs/check-integrity.h

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* 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.
174
*/
185

19-
#if !defined(__BTRFS_CHECK_INTEGRITY__)
20-
#define __BTRFS_CHECK_INTEGRITY__
6+
#ifndef BTRFS_CHECK_INTEGRITY_H
7+
#define BTRFS_CHECK_INTEGRITY_H
218

229
#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
2310
int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh);

‎fs/btrfs/compression.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* 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.
174
*/
185

196
#include <linux/kernel.h>

‎fs/btrfs/compression.h

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* 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.
174
*/
185

19-
#ifndef __BTRFS_COMPRESSION_
20-
#define __BTRFS_COMPRESSION_
6+
#ifndef BTRFS_COMPRESSION_H
7+
#define BTRFS_COMPRESSION_H
218

229
/*
2310
* We want to make sure that amount of RAM required to uncompress an extent is

‎fs/btrfs/ctree.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* Copyright (C) 2007,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.
174
*/
185

196
#include <linux/sched.h>

‎fs/btrfs/ctree.h

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* 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.
174
*/
185

19-
#ifndef __BTRFS_CTREE__
20-
#define __BTRFS_CTREE__
6+
#ifndef BTRFS_CTREE_H
7+
#define BTRFS_CTREE_H
218

229
#include <linux/mm.h>
2310
#include <linux/sched/signal.h>
@@ -3752,4 +3739,5 @@ static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info)
37523739
#endif
37533740
return 0;
37543741
}
3742+
37553743
#endif

‎fs/btrfs/dedupe.h

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* 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.
174
*/
185

19-
#ifndef __BTRFS_DEDUPE__
20-
#define __BTRFS_DEDUPE__
6+
#ifndef BTRFS_DEDUPE_H
7+
#define BTRFS_DEDUPE_H
218

229
/* later in-band dedupe will expand this struct */
2310
struct btrfs_dedupe_hash;
11+
2412
#endif

‎fs/btrfs/delayed-inode.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,7 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* Copyright (C) 2011 Fujitsu. All rights reserved.
34
* 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.
185
*/
196

207
#include <linux/slab.h>

‎fs/btrfs/delayed-inode.h

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* Copyright (C) 2011 Fujitsu. All rights reserved.
34
* 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.
185
*/
196

20-
#ifndef __DELAYED_TREE_OPERATION_H
21-
#define __DELAYED_TREE_OPERATION_H
7+
#ifndef BTRFS_DELAYED_INODE_H
8+
#define BTRFS_DELAYED_INODE_H
229

2310
#include <linux/rbtree.h>
2411
#include <linux/spinlock.h>

0 commit comments

Comments
 (0)