bcachefs: Print version_incompat_allowed on startup
PATCH 1/2 bcachefs: Print version_incompat_allowed on startup
Let users know if incompatible features aren't enabled
Signed-off-by Kent Overstreet <[email protected]>
--- fs/bcachefs/super.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/bcachefs/super.c +5 -0
@@ -1013,6 +1013,11 @@ static void print_mount_opts(struct bch_fs *c)bch2_opt_to_text (&p, c, c->disk_sb.sb, opt, v,OPT_SHOW_MOUNT_STYLE ); } +if (c->sb.version_incompat_allowed != c->sb.version) { +prt_printf (&p,"\n allowing incompatible features above " ); +bch2_version_to_text (&p, c->sb.version_incompat_allowed); + } +bch_info (c,"%s" , p.buf);printbuf_exit (&p); }
Signature · 1 line
2.49.0
PATCH 2/2 bcachefs: Log message when incompat version requested but not enabled
Signed-off-by Kent Overstreet <[email protected]>
--- fs/bcachefs/bcachefs.h | 2 ++ fs/bcachefs/fs-ioctl.c | 2 +- fs/bcachefs/super-io.c | 20 ++++++++++++++++++-- fs/bcachefs/super.c | 1 + 4 files changed, 22 insertions(+), 3 deletions(-)
fs/bcachefs/bcachefs.h +2 -0
@@ -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/fs-ioctl.c +1 -1
@@ -69,7 +69,7 @@ static int bch2_inode_flags_set(struct btree_trans *trans,if (ret <0 )return ret; - ret =bch2_request_incompat_feature (c,bcachefs_metadata_version_casefolding); + ret =bch2_request_incompat_feature (c, bcachefs_metadata_version_casefolding);if (ret)return ret;
fs/bcachefs/super-io.c +18 -2
@@ -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; +mutex_lock (&c->sb_lock);if (!ret) { -mutex_lock (&c->sb_lock);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
@@ -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);
Signature · 1 line
2.49.0