Commit 686db67a authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Move unicode message to after the startup message

parent 1cda5b88
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -1038,10 +1038,6 @@ static struct bch_fs *bch2_fs_alloc(struct bch_sb *sb, struct bch_opts *opts,
		ret = -EINVAL;
		goto err;
	}
	bch_info(c, "Using encoding defined by superblock: utf8-%u.%u.%u",
		 unicode_major(BCH_FS_DEFAULT_UTF8_ENCODING),
		 unicode_minor(BCH_FS_DEFAULT_UTF8_ENCODING),
		 unicode_rev(BCH_FS_DEFAULT_UTF8_ENCODING));
#else
	if (c->sb.features & BIT_ULL(BCH_FEATURE_casefolding)) {
		printk(KERN_ERR "Cannot mount a filesystem with casefolding on a kernel without CONFIG_UNICODE\n");
@@ -1159,6 +1155,12 @@ int bch2_fs_start(struct bch_fs *c)

	print_mount_opts(c);

	if (IS_ENABLED(CONFIG_UNICODE))
		bch_info(c, "Using encoding defined by superblock: utf8-%u.%u.%u",
			 unicode_major(BCH_FS_DEFAULT_UTF8_ENCODING),
			 unicode_minor(BCH_FS_DEFAULT_UTF8_ENCODING),
			 unicode_rev(BCH_FS_DEFAULT_UTF8_ENCODING));

	if (!bch2_fs_may_start(c))
		return -BCH_ERR_insufficient_devices_to_start;