Commit b70f5097 authored by Naohiro Aota's avatar Naohiro Aota Committed by David Sterba
Browse files

btrfs: check and enable ZONED mode 



Introduce function btrfs_check_zoned_mode() to check if ZONED flag is
enabled on the file system and if the file system consists of zoned
devices with equal zone size.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5b316468

fs/btrfs/ctree.h

+14 −0
Original line number Diff line number Diff line
@@ -956,6 +956,15 @@ struct btrfs_fs_info { 
	/* Type of exclusive operation running */

	unsigned long exclusive_operation;



	/*

	 * Zone size > 0 when in ZONED mode, otherwise it's used for a check

	 * if the mode is enabled

	 */

	union {

		u64 zone_size;

		u64 zoned;

	};



#ifdef CONFIG_BTRFS_FS_REF_VERIFY

	spinlock_t ref_verify_lock;

	struct rb_root block_tree;
@@ -3677,4 +3686,9 @@ static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info) 
}

#endif



static inline bool btrfs_is_zoned(const struct btrfs_fs_info *fs_info)

{

	return fs_info->zoned != 0;

}



#endif

fs/btrfs/dev-replace.c

+7 −0
Original line number Diff line number Diff line
@@ -260,6 +260,13 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, 
		return PTR_ERR(bdev);

	}



	if (!btrfs_check_device_zone_type(fs_info, bdev)) {

		btrfs_err(fs_info,

		"dev-replace: zoned type of target device mismatch with filesystem");

		ret = -EINVAL;

		goto error;

	}



	sync_blockdev(bdev);



	list_for_each_entry(device, &fs_info->fs_devices->devices, dev_list) {

fs/btrfs/disk-io.c

+10 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "block-group.h"

#include "discard.h"

#include "space-info.h"

#include "zoned.h"



#define BTRFS_SUPER_FLAG_SUPP	(BTRFS_HEADER_FLAG_WRITTEN |\

				 BTRFS_HEADER_FLAG_RELOC |\
@@ -3046,6 +3047,8 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device 
	if (features & BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA)

		btrfs_info(fs_info, "has skinny extents");



	fs_info->zoned = (features & BTRFS_FEATURE_INCOMPAT_ZONED);



	/*

	 * flag our filesystem as having big metadata blocks if

	 * they are bigger than the page size
@@ -3202,6 +3205,13 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device 
		goto fail_block_groups;

	}



	ret = btrfs_check_zoned_mode(fs_info);

	if (ret) {

		btrfs_err(fs_info, "failed to initialize zoned mode: %d",

			  ret);

		goto fail_block_groups;

	}



	ret = btrfs_sysfs_add_fsid(fs_devices);

	if (ret) {

		btrfs_err(fs_info, "failed to init sysfs fsid interface: %d",

fs/btrfs/super.c

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "backref.h"

#include "space-info.h"

#include "sysfs.h"

#include "zoned.h"

#include "tests/btrfs-tests.h"

#include "block-group.h"

#include "discard.h"

fs/btrfs/volumes.c

+5 −0
Original line number Diff line number Diff line
@@ -2515,6 +2515,11 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path 
	if (IS_ERR(bdev))

		return PTR_ERR(bdev);



	if (!btrfs_check_device_zone_type(fs_info, bdev)) {

		ret = -EINVAL;

		goto error;

	}



	if (fs_devices->seeding) {

		seeding_dev = 1;

		down_write(&sb->s_umount);