Commit c3b02e6d authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Log message when incompat version requested but not enabled 



Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 14bcf982

fs/bcachefs/bcachefs.h

+2 −0
Original line number Diff line number Diff line
@@ -788,6 +788,8 @@ struct bch_fs { 
		unsigned long	errors_silent[BITS_TO_LONGS(BCH_FSCK_ERR_MAX)];

		u64		btrees_lost_data;

	}			sb;

	DARRAY(enum bcachefs_metadata_version)

				incompat_versions_requested;



#ifdef CONFIG_UNICODE

	struct unicode_map	*cf_encoding;

fs/bcachefs/super-io.c

+18 −2
Original line number Diff line number Diff line
@@ -73,14 +73,30 @@ int bch2_set_version_incompat(struct bch_fs *c, enum bcachefs_metadata_version v 
		? 0

		: -BCH_ERR_may_not_use_incompat_feature;



	if (!ret) {

	mutex_lock(&c->sb_lock);

	if (!ret) {

		SET_BCH_SB_VERSION_INCOMPAT(c->disk_sb.sb,

			max(BCH_SB_VERSION_INCOMPAT(c->disk_sb.sb), version));

		bch2_write_super(c);

		mutex_unlock(&c->sb_lock);

	} else {

		darray_for_each(c->incompat_versions_requested, i)

			if (version == *i)

				goto out;



		darray_push(&c->incompat_versions_requested, version);

		struct printbuf buf = PRINTBUF;

		prt_str(&buf, "requested incompat feature ");

		bch2_version_to_text(&buf, version);

		prt_str(&buf, " currently not enabled");

		prt_printf(&buf, "\n  set version_upgrade=incompat to enable");



		bch_notice(c, "%s", buf.buf);

		printbuf_exit(&buf);

	}



out:

	mutex_unlock(&c->sb_lock);



	return ret;

}

fs/bcachefs/super.c

+1 −0
Original line number Diff line number Diff line
@@ -589,6 +589,7 @@ static void __bch2_fs_free(struct bch_fs *c) 
		free_percpu(c->online_reserved);

	}



	darray_exit(&c->incompat_versions_requested);

	darray_exit(&c->btree_roots_extra);

	free_percpu(c->pcpu);

	free_percpu(c->usage);

fs/bcachefs/fs-ioctl.c

+1 −1

File changed.

Contains only whitespace changes.