Commit 4f4274af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs 

Pull btrfs fixes from Chris Mason:
 "Filipe is nailing down some problems with our skinny extent variation,
  and Dave's patch fixes endian problems in the new super block checks"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix race that makes btrfs_lookup_extent_info miss skinny extent items
  Btrfs: properly clean up btrfs_end_io_wq_cache
  Btrfs: fix invalid leaf slot access in btrfs_lookup_extent()
  btrfs: use macro accessors in superblock validation checks
parents 9f935675 d05a2b4c

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -3276,7 +3276,7 @@ int btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, 
			   struct btrfs_root *root, unsigned long count);

int btrfs_async_run_delayed_refs(struct btrfs_root *root,

				 unsigned long count, int wait);

int btrfs_lookup_extent(struct btrfs_root *root, u64 start, u64 len);

int btrfs_lookup_data_extent(struct btrfs_root *root, u64 start, u64 len);

int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,

			     struct btrfs_root *root, u64 bytenr,

			     u64 offset, int metadata, u64 *refs, u64 *flags);

fs/btrfs/disk-io.c

+22 −21
Original line number Diff line number Diff line
@@ -3817,19 +3817,19 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info, 
	struct btrfs_super_block *sb = fs_info->super_copy;

	int ret = 0;



	if (sb->root_level > BTRFS_MAX_LEVEL) {

		printk(KERN_ERR "BTRFS: tree_root level too big: %d > %d\n",

				sb->root_level, BTRFS_MAX_LEVEL);

	if (btrfs_super_root_level(sb) >= BTRFS_MAX_LEVEL) {

		printk(KERN_ERR "BTRFS: tree_root level too big: %d >= %d\n",

				btrfs_super_root_level(sb), BTRFS_MAX_LEVEL);

		ret = -EINVAL;

	}

	if (sb->chunk_root_level > BTRFS_MAX_LEVEL) {

		printk(KERN_ERR "BTRFS: chunk_root level too big: %d > %d\n",

				sb->chunk_root_level, BTRFS_MAX_LEVEL);

	if (btrfs_super_chunk_root_level(sb) >= BTRFS_MAX_LEVEL) {

		printk(KERN_ERR "BTRFS: chunk_root level too big: %d >= %d\n",

				btrfs_super_chunk_root_level(sb), BTRFS_MAX_LEVEL);

		ret = -EINVAL;

	}

	if (sb->log_root_level > BTRFS_MAX_LEVEL) {

		printk(KERN_ERR "BTRFS: log_root level too big: %d > %d\n",

				sb->log_root_level, BTRFS_MAX_LEVEL);

	if (btrfs_super_log_root_level(sb) >= BTRFS_MAX_LEVEL) {

		printk(KERN_ERR "BTRFS: log_root level too big: %d >= %d\n",

				btrfs_super_log_root_level(sb), BTRFS_MAX_LEVEL);

		ret = -EINVAL;

	}
@@ -3837,15 +3837,15 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info, 
	 * The common minimum, we don't know if we can trust the nodesize/sectorsize

	 * items yet, they'll be verified later. Issue just a warning.

	 */

	if (!IS_ALIGNED(sb->root, 4096))

	if (!IS_ALIGNED(btrfs_super_root(sb), 4096))

		printk(KERN_WARNING "BTRFS: tree_root block unaligned: %llu\n",

				sb->root);

	if (!IS_ALIGNED(sb->chunk_root, 4096))

	if (!IS_ALIGNED(btrfs_super_chunk_root(sb), 4096))

		printk(KERN_WARNING "BTRFS: tree_root block unaligned: %llu\n",

				sb->chunk_root);

	if (!IS_ALIGNED(sb->log_root, 4096))

	if (!IS_ALIGNED(btrfs_super_log_root(sb), 4096))

		printk(KERN_WARNING "BTRFS: tree_root block unaligned: %llu\n",

				sb->log_root);

				btrfs_super_log_root(sb));



	if (memcmp(fs_info->fsid, sb->dev_item.fsid, BTRFS_UUID_SIZE) != 0) {

		printk(KERN_ERR "BTRFS: dev_item UUID does not match fsid: %pU != %pU\n",
@@ -3857,13 +3857,13 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info, 
	 * Hint to catch really bogus numbers, bitflips or so, more exact checks are

	 * done later

	 */

	if (sb->num_devices > (1UL << 31))

	if (btrfs_super_num_devices(sb) > (1UL << 31))

		printk(KERN_WARNING "BTRFS: suspicious number of devices: %llu\n",

				sb->num_devices);

				btrfs_super_num_devices(sb));



	if (sb->bytenr != BTRFS_SUPER_INFO_OFFSET) {

	if (btrfs_super_bytenr(sb) != BTRFS_SUPER_INFO_OFFSET) {

		printk(KERN_ERR "BTRFS: super offset mismatch %llu != %u\n",

				sb->bytenr, BTRFS_SUPER_INFO_OFFSET);

				btrfs_super_bytenr(sb), BTRFS_SUPER_INFO_OFFSET);

		ret = -EINVAL;

	}
@@ -3871,14 +3871,15 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info, 
	 * The generation is a global counter, we'll trust it more than the others

	 * but it's still possible that it's the one that's wrong.

	 */

	if (sb->generation < sb->chunk_root_generation)

	if (btrfs_super_generation(sb) < btrfs_super_chunk_root_generation(sb))

		printk(KERN_WARNING

			"BTRFS: suspicious: generation < chunk_root_generation: %llu < %llu\n",

			sb->generation, sb->chunk_root_generation);

	if (sb->generation < sb->cache_generation && sb->cache_generation != (u64)-1)

			btrfs_super_generation(sb), btrfs_super_chunk_root_generation(sb));

	if (btrfs_super_generation(sb) < btrfs_super_cache_generation(sb)

	    && btrfs_super_cache_generation(sb) != (u64)-1)

		printk(KERN_WARNING

			"BTRFS: suspicious: generation < cache_generation: %llu < %llu\n",

			sb->generation, sb->cache_generation);

			btrfs_super_generation(sb), btrfs_super_cache_generation(sb));



	return ret;

}

fs/btrfs/extent-tree.c

+2 −16
Original line number Diff line number Diff line
@@ -710,8 +710,8 @@ void btrfs_clear_space_info_full(struct btrfs_fs_info *info) 
	rcu_read_unlock();

}



/* simple helper to search for an existing extent at a given offset */

int btrfs_lookup_extent(struct btrfs_root *root, u64 start, u64 len)

/* simple helper to search for an existing data extent at a given offset */

int btrfs_lookup_data_extent(struct btrfs_root *root, u64 start, u64 len)

{

	int ret;

	struct btrfs_key key;
@@ -726,12 +726,6 @@ int btrfs_lookup_extent(struct btrfs_root *root, u64 start, u64 len) 
	key.type = BTRFS_EXTENT_ITEM_KEY;

	ret = btrfs_search_slot(NULL, root->fs_info->extent_root, &key, path,

				0, 0);

	if (ret > 0) {

		btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);

		if (key.objectid == start &&

		    key.type == BTRFS_METADATA_ITEM_KEY)

			ret = 0;

	}

	btrfs_free_path(path);

	return ret;

}
@@ -786,7 +780,6 @@ search_again: 
	else

		key.type = BTRFS_EXTENT_ITEM_KEY;



again:

	ret = btrfs_search_slot(trans, root->fs_info->extent_root,

				&key, path, 0, 0);

	if (ret < 0)
@@ -802,13 +795,6 @@ again: 
			    key.offset == root->nodesize)

				ret = 0;

		}

		if (ret) {

			key.objectid = bytenr;

			key.type = BTRFS_EXTENT_ITEM_KEY;

			key.offset = root->nodesize;

			btrfs_release_path(path);

			goto again;

		}

	}



	if (ret == 0) {

fs/btrfs/super.c

+1 −0
Original line number Diff line number Diff line
@@ -2151,6 +2151,7 @@ static void __exit exit_btrfs_fs(void) 
	extent_map_exit();

	extent_io_exit();

	btrfs_interface_exit();

	btrfs_end_io_wq_exit();

	unregister_filesystem(&btrfs_fs_type);

	btrfs_exit_sysfs();

	btrfs_cleanup_fs_uuids();

fs/btrfs/tree-log.c

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, 
			 * is this extent already allocated in the extent

			 * allocation tree?  If so, just add a reference

			 */

			ret = btrfs_lookup_extent(root, ins.objectid,

			ret = btrfs_lookup_data_extent(root, ins.objectid,

						ins.offset);

			if (ret == 0) {

				ret = btrfs_inc_extent_ref(trans, root,

CRA Git | Maintained and supported by SUSTech CRA and CCSE