From: Kent Overstreet Date: Sun, 25 May 2025 15:51:33 +0000 (-0400) Subject: bcachefs: Move unicode message to after the startup message X-Git-Tag: v6.16-rc1~48^2~62 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=686db67a8ebecdc6eb7b9ca8ef8eddb99bdf1083;p=thirdparty%2Fkernel%2Flinux.git bcachefs: Move unicode message to after the startup message Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c index 11579b74c6400..df42a66b8bc34 100644 --- a/fs/bcachefs/super.c +++ b/fs/bcachefs/super.c @@ -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;