bcachefs: Log message when incompat version requested but not enabled

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h
index 5cb0fc384ac020290493ed6f47cd5a4b03c11d5f..75f7408da1736bbe8262cf40428fe3aa1744e033 100644 (file)
--- a/fs/bcachefs/bcachefs.h
+++ b/fs/bcachefs/bcachefs.h
@@ -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;

diff --git a/fs/bcachefs/fs-ioctl.c b/fs/bcachefs/fs-ioctl.c
index c1553e44e049a3d3625839086a10beb1a78af9f8..14886e1d4d6dff1c6beecc92780cdb1e0f43cba4 100644 (file)
--- a/fs/bcachefs/fs-ioctl.c
+++ b/fs/bcachefs/fs-ioctl.c
@@ -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;
 

diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c
index e27422b6d9c6a96974cef8af097e4908cee3dd41..25b6bce05c3cce6993ef86b25cf3276527117a39 100644 (file)
--- a/fs/bcachefs/super-io.c
+++ b/fs/bcachefs/super-io.c
@@ -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;
 }
 

diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c
index f1eef5e7698bf42b9930e24718a6207765297d4f..e8a17ed1615d30ebfd2bcfe0ef541d0903331027 100644 (file)
--- a/fs/bcachefs/super.c
+++ b/fs/bcachefs/super.c
@@ -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);