Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 622ced79 authored by Qu Wenruo's avatar Qu Wenruo Committed by Greg Kroah-Hartman
Browse files

btrfs: add "0x" prefix for unsupported optional features 



commit d5321a0fa8bc49f11bea0b470800962c17d92d8f upstream.

The following error message lack the "0x" obviously:

  cannot mount because of unsupported optional features (4000)

Add the prefix to make it less confusing. This can happen on older
kernels that try to mount a filesystem with newer features so it makes
sense to backport to older trees.

CC: stable@vger.kernel.org # 4.14+
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ca51120

fs/btrfs/disk-io.c

+2 −2
Original line number Diff line number Diff line
@@ -2927,7 +2927,7 @@ int open_ctree(struct super_block *sb, 
		~BTRFS_FEATURE_INCOMPAT_SUPP;

	if (features) {

		btrfs_err(fs_info,

		    "cannot mount because of unsupported optional features (%llx)",

		    "cannot mount because of unsupported optional features (0x%llx)",

		    features);

		err = -EINVAL;

		goto fail_csum;
@@ -2965,7 +2965,7 @@ int open_ctree(struct super_block *sb, 
		~BTRFS_FEATURE_COMPAT_RO_SUPP;

	if (!sb_rdonly(sb) && features) {

		btrfs_err(fs_info,

	"cannot mount read-write because of unsupported optional features (%llx)",

	"cannot mount read-write because of unsupported optional features (0x%llx)",

		       features);

		err = -EINVAL;

		goto fail_csum;