Commit 42c54d54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs fixes from David Sterba:
 "A few short fixes and a lockdep warning fix (needs moving some code):

   - tree-log replay fixes:
      - fix error handling when looking up extent refs
      - fix warning when setting inode number of links

   - relocation fixes:
      - reset block group read-only status when relocation fails
      - unset control structure if transaction fails when starting
        to process a block group
      - add lockdep annotations to fix a warning during relocation
        where blocks temporarily belong to another tree and can lead
        to reversed dependencies

   - tree-checker verifies that extent items don't overlap"

* tag 'for-6.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: tree-checker: check for overlapping extent items
  btrfs: fix warning during log replay when bumping inode link count
  btrfs: fix lost error handling when looking up extended ref on log replay
  btrfs: fix lockdep splat with reloc root extent buffers
  btrfs: move lockdep class helpers to locking.c
  btrfs: unset reloc control if transaction commit fails in prepare_to_relocate()
  btrfs: reset RO counter on block group if we fail to relocate
parents a3a78b63 899b7f69

fs/btrfs/block-group.c

+3 −1
Original line number Diff line number Diff line
@@ -1640,9 +1640,11 @@ void btrfs_reclaim_bgs_work(struct work_struct *work) 
				div64_u64(zone_unusable * 100, bg->length));

		trace_btrfs_reclaim_block_group(bg);

		ret = btrfs_relocate_chunk(fs_info, bg->start);

		if (ret)

		if (ret) {

			btrfs_dec_block_group_ro(bg);

			btrfs_err(fs_info, "error relocating chunk %llu",

				  bg->start);

		}



next:

		btrfs_put_block_group(bg);

fs/btrfs/ctree.c

+3 −0
Original line number Diff line number Diff line
@@ -2075,6 +2075,9 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root *root, 


		if (!p->skip_locking) {

			level = btrfs_header_level(b);



			btrfs_maybe_reset_lockdep_class(root, b);



			if (level <= write_lock_level) {

				btrfs_tree_lock(b);

				p->locks[level] = BTRFS_WRITE_LOCK;

fs/btrfs/ctree.h

+2 −0
Original line number Diff line number Diff line
@@ -1173,6 +1173,8 @@ enum { 
	BTRFS_ROOT_ORPHAN_CLEANUP,

	/* This root has a drop operation that was started previously. */

	BTRFS_ROOT_UNFINISHED_DROP,

	/* This reloc root needs to have its buffers lockdep class reset. */

	BTRFS_ROOT_RESET_LOCKDEP_CLASS,

};



static inline void btrfs_wake_unfinished_drop(struct btrfs_fs_info *fs_info)

fs/btrfs/disk-io.c

+0 −82
Original line number Diff line number Diff line
@@ -86,88 +86,6 @@ struct async_submit_bio { 
	blk_status_t status;

};



/*

 * Lockdep class keys for extent_buffer->lock's in this root.  For a given

 * eb, the lockdep key is determined by the btrfs_root it belongs to and

 * the level the eb occupies in the tree.

 *

 * Different roots are used for different purposes and may nest inside each

 * other and they require separate keysets.  As lockdep keys should be

 * static, assign keysets according to the purpose of the root as indicated

 * by btrfs_root->root_key.objectid.  This ensures that all special purpose

 * roots have separate keysets.

 *

 * Lock-nesting across peer nodes is always done with the immediate parent

 * node locked thus preventing deadlock.  As lockdep doesn't know this, use

 * subclass to avoid triggering lockdep warning in such cases.

 *

 * The key is set by the readpage_end_io_hook after the buffer has passed

 * csum validation but before the pages are unlocked.  It is also set by

 * btrfs_init_new_buffer on freshly allocated blocks.

 *

 * We also add a check to make sure the highest level of the tree is the

 * same as our lockdep setup here.  If BTRFS_MAX_LEVEL changes, this code

 * needs update as well.

 */

#ifdef CONFIG_DEBUG_LOCK_ALLOC

# if BTRFS_MAX_LEVEL != 8

#  error

# endif



#define DEFINE_LEVEL(stem, level)					\

	.names[level] = "btrfs-" stem "-0" #level,



#define DEFINE_NAME(stem)						\

	DEFINE_LEVEL(stem, 0)						\

	DEFINE_LEVEL(stem, 1)						\

	DEFINE_LEVEL(stem, 2)						\

	DEFINE_LEVEL(stem, 3)						\

	DEFINE_LEVEL(stem, 4)						\

	DEFINE_LEVEL(stem, 5)						\

	DEFINE_LEVEL(stem, 6)						\

	DEFINE_LEVEL(stem, 7)



static struct btrfs_lockdep_keyset {

	u64			id;		/* root objectid */

	/* Longest entry: btrfs-free-space-00 */

	char			names[BTRFS_MAX_LEVEL][20];

	struct lock_class_key	keys[BTRFS_MAX_LEVEL];

} btrfs_lockdep_keysets[] = {

	{ .id = BTRFS_ROOT_TREE_OBJECTID,	DEFINE_NAME("root")	},

	{ .id = BTRFS_EXTENT_TREE_OBJECTID,	DEFINE_NAME("extent")	},

	{ .id = BTRFS_CHUNK_TREE_OBJECTID,	DEFINE_NAME("chunk")	},

	{ .id = BTRFS_DEV_TREE_OBJECTID,	DEFINE_NAME("dev")	},

	{ .id = BTRFS_CSUM_TREE_OBJECTID,	DEFINE_NAME("csum")	},

	{ .id = BTRFS_QUOTA_TREE_OBJECTID,	DEFINE_NAME("quota")	},

	{ .id = BTRFS_TREE_LOG_OBJECTID,	DEFINE_NAME("log")	},

	{ .id = BTRFS_TREE_RELOC_OBJECTID,	DEFINE_NAME("treloc")	},

	{ .id = BTRFS_DATA_RELOC_TREE_OBJECTID,	DEFINE_NAME("dreloc")	},

	{ .id = BTRFS_UUID_TREE_OBJECTID,	DEFINE_NAME("uuid")	},

	{ .id = BTRFS_FREE_SPACE_TREE_OBJECTID,	DEFINE_NAME("free-space") },

	{ .id = 0,				DEFINE_NAME("tree")	},

};



#undef DEFINE_LEVEL

#undef DEFINE_NAME



void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb,

				    int level)

{

	struct btrfs_lockdep_keyset *ks;



	BUG_ON(level >= ARRAY_SIZE(ks->keys));



	/* find the matching keyset, id 0 is the default entry */

	for (ks = btrfs_lockdep_keysets; ks->id; ks++)

		if (ks->id == objectid)

			break;



	lockdep_set_class_and_name(&eb->lock,

				   &ks->keys[level], ks->names[level]);

}



#endif



/*

 * Compute the csum of a btree block and store the result to provided buffer.

 */

fs/btrfs/disk-io.h

+0 −10
Original line number Diff line number Diff line
@@ -137,14 +137,4 @@ int btrfs_get_num_tolerated_disk_barrier_failures(u64 flags); 
int btrfs_get_free_objectid(struct btrfs_root *root, u64 *objectid);

int btrfs_init_root_free_objectid(struct btrfs_root *root);



#ifdef CONFIG_DEBUG_LOCK_ALLOC

void btrfs_set_buffer_lockdep_class(u64 objectid,

			            struct extent_buffer *eb, int level);

#else

static inline void btrfs_set_buffer_lockdep_class(u64 objectid,

					struct extent_buffer *eb, int level)

{

}

#endif



#endif