Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e37563bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 09c9b0ea 5d41be6f

fs/btrfs/Kconfig

+2 −0
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



config BTRFS_FS

config BTRFS_FS

	tristate "Btrfs filesystem support"

	tristate "Btrfs filesystem support"

	select LIBCRC32C

	select LIBCRC32C

fs/btrfs/acl.c

+1 −14
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

/*

 * Copyright (C) 2007 Red Hat.  All rights reserved.

 * Copyright (C) 2007 Red Hat.  All rights reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public

 * License v2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public

 * License along with this program; if not, write to the

 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,

 * Boston, MA 021110-1307, USA.

 */

 */





#include <linux/fs.h>

#include <linux/fs.h>

fs/btrfs/async-thread.c

+1 −14
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

/*

 * Copyright (C) 2007 Oracle.  All rights reserved.

 * Copyright (C) 2007 Oracle.  All rights reserved.

 * Copyright (C) 2014 Fujitsu.  All rights reserved.

 * Copyright (C) 2014 Fujitsu.  All rights reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public

 * License v2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public

 * License along with this program; if not, write to the

 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,

 * Boston, MA 021110-1307, USA.

 */

 */





#include <linux/kthread.h>

#include <linux/kthread.h>

fs/btrfs/async-thread.h

+5 −16
Original line number Original line Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

/*

 * Copyright (C) 2007 Oracle.  All rights reserved.

 * Copyright (C) 2007 Oracle.  All rights reserved.

 * Copyright (C) 2014 Fujitsu.  All rights reserved.

 * Copyright (C) 2014 Fujitsu.  All rights reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public

 * License v2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public

 * License along with this program; if not, write to the

 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,

 * Boston, MA 021110-1307, USA.

 */

 */





#ifndef __BTRFS_ASYNC_THREAD_

#ifndef BTRFS_ASYNC_THREAD_H

#define __BTRFS_ASYNC_THREAD_

#define BTRFS_ASYNC_THREAD_H



#include <linux/workqueue.h>

#include <linux/workqueue.h>





struct btrfs_fs_info;

struct btrfs_fs_info;
@@ -85,4 +73,5 @@ void btrfs_set_work_high_priority(struct btrfs_work *work); 
struct btrfs_fs_info *btrfs_work_owner(const struct btrfs_work *work);

struct btrfs_fs_info *btrfs_work_owner(const struct btrfs_work *work);

struct btrfs_fs_info *btrfs_workqueue_owner(const struct __btrfs_workqueue *wq);

struct btrfs_fs_info *btrfs_workqueue_owner(const struct __btrfs_workqueue *wq);

bool btrfs_workqueue_normal_congested(const struct btrfs_workqueue *wq);

bool btrfs_workqueue_normal_congested(const struct btrfs_workqueue *wq);



#endif
 
#endif

fs/btrfs/backref.c

+1 −14
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

/*

 * Copyright (C) 2011 STRATO.  All rights reserved.

 * Copyright (C) 2011 STRATO.  All rights reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public

 * License v2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public

 * License along with this program; if not, write to the

 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,

 * Boston, MA 021110-1307, USA.

 */

 */





#include <linux/mm.h>

#include <linux/mm.h>