Merge with 1a2bb21f21 bcachefs: Put inline data behind a mount option for now

7 files changed, 30 insertions, 46 deletions

diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c
index f483312acd0d..17ea38e42ae8 100644
--- a/fs/bcachefs/io.c
+++ b/fs/bcachefs/io.c
@@ -1139,6 +1139,8 @@ static void bch2_write_data_inline(struct bch_write_op *op, unsigned data_len)
 	unsigned sectors;
 	int ret;
 
+	bch2_check_set_feature(op->c, BCH_FEATURE_INLINE_DATA);
+
 	ret = bch2_keylist_realloc(&op->insert_keys, op->inline_keys,
 				   ARRAY_SIZE(op->inline_keys),
 				   BKEY_U64s + DIV_ROUND_UP(data_len, 8));
@@ -1220,7 +1222,8 @@ void bch2_write(struct closure *cl)
 	data_len = min_t(u64, bio->bi_iter.bi_size,
 			 op->new_i_size - (op->pos.offset << 9));
 
-	if (data_len <= min(block_bytes(c) / 2, 1024U)) {
+	if (c->opts.inline_data &&
+	    data_len <= min(block_bytes(c) / 2, 1024U)) {
 		bch2_write_data_inline(op, data_len);
 		return;
 	}
diff --git a/fs/bcachefs/opts.c b/fs/bcachefs/opts.c
index 13a9a2fcd575..cbacd2f36799 100644
--- a/fs/bcachefs/opts.c
+++ b/fs/bcachefs/opts.c
@@ -299,15 +299,8 @@ int bch2_opt_check_may_set(struct bch_fs *c, int id, u64 v)
 		ret = bch2_check_set_has_compressed_data(c, v);
 		break;
 	case Opt_erasure_code:
-		if (v &&
-		    !(c->sb.features & (1ULL << BCH_FEATURE_EC))) {
-			mutex_lock(&c->sb_lock);
-			c->disk_sb.sb->features[0] |=
-				cpu_to_le64(1ULL << BCH_FEATURE_EC);
-
-			bch2_write_super(c);
-			mutex_unlock(&c->sb_lock);
-		}
+		if (v)
+			bch2_check_set_feature(c, BCH_FEATURE_EC);
 		break;
 	}
 
diff --git a/fs/bcachefs/opts.h b/fs/bcachefs/opts.h
index 0ec0999a6214..1f11f4152a6f 100644
--- a/fs/bcachefs/opts.h
+++ b/fs/bcachefs/opts.h
@@ -181,6 +181,11 @@ enum opt_type {
 	  OPT_BOOL(),							\
 	  BCH_SB_128_BIT_MACS,		false,				\
 	  NULL,		"Store full 128 bits of cryptographic MACs, instead of 80")\
+	x(inline_data,			u8,				\
+	  OPT_MOUNT|OPT_RUNTIME,					\
+	  OPT_BOOL(),							\
+	  NO_SB_OPT,			false,				\
+	  NULL,		"Enable inline data extents")			\
 	x(acl,				u8,				\
 	  OPT_FORMAT|OPT_MOUNT,						\
 	  OPT_BOOL(),							\
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index d4002b7fc917..e6b51131cff2 100644
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -913,12 +913,6 @@ int bch2_fs_recovery(struct bch_fs *c)
 		write_sb = true;
 	}
 
-	if (!(c->sb.features & (1ULL << BCH_FEATURE_INLINE_DATA))) {
-		c->disk_sb.sb->features[0] |=
-			cpu_to_le64(1ULL << BCH_FEATURE_INLINE_DATA);
-		write_sb = true;
-	}
-
 	if (!test_bit(BCH_FS_ERROR, &c->flags)) {
 		c->disk_sb.sb->compat[0] |= 1ULL << BCH_COMPAT_FEAT_ALLOC_INFO;
 		write_sb = true;
diff --git a/fs/bcachefs/reflink.c b/fs/bcachefs/reflink.c
index 2812fa305c0e..53bd0e0ea058 100644
--- a/fs/bcachefs/reflink.c
+++ b/fs/bcachefs/reflink.c
@@ -171,16 +171,7 @@ s64 bch2_remap_range(struct bch_fs *c,
 	if (!percpu_ref_tryget(&c->writes))
 		return -EROFS;
 
-	if (!(c->sb.features & (1ULL << BCH_FEATURE_REFLINK))) {
-		mutex_lock(&c->sb_lock);
-		if (!(c->sb.features & (1ULL << BCH_FEATURE_REFLINK))) {
-			c->disk_sb.sb->features[0] |=
-				cpu_to_le64(1ULL << BCH_FEATURE_REFLINK);
-
-			bch2_write_super(c);
-		}
-		mutex_unlock(&c->sb_lock);
-	}
+	bch2_check_set_feature(c, BCH_FEATURE_REFLINK);
 
 	dst_end.offset += remap_sectors;
 	src_end.offset += remap_sectors;
diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c
index b36cfdf0b41c..daaeaf0446a3 100644
--- a/fs/bcachefs/super-io.c
+++ b/fs/bcachefs/super-io.c
@@ -795,6 +795,17 @@ out:
 	return ret;
 }
 
+void __bch2_check_set_feature(struct bch_fs *c, unsigned feat)
+{
+	mutex_lock(&c->sb_lock);
+	if (!(c->sb.features & (1ULL << feat))) {
+		c->disk_sb.sb->features[0] |= cpu_to_le64(1ULL << feat);
+
+		bch2_write_super(c);
+	}
+	mutex_unlock(&c->sb_lock);
+}
+
 /* BCH_SB_FIELD_journal: */
 
 static int u64_cmp(const void *_l, const void *_r)
diff --git a/fs/bcachefs/super-io.h b/fs/bcachefs/super-io.h
index f5450e596c62..7a068158efca 100644
--- a/fs/bcachefs/super-io.h
+++ b/fs/bcachefs/super-io.h
@@ -43,26 +43,6 @@ struct bch_sb_field_ops {
 				   struct bch_sb_field *);
 };
 
-static inline bool bch2_sb_test_feature(struct bch_sb *sb,
-					enum bch_sb_features f)
-{
-	unsigned w = f / 64;
-	unsigned b = f % 64;
-
-	return le64_to_cpu(sb->features[w]) & (1ULL << b);
-}
-
-static inline void bch2_sb_set_feature(struct bch_sb *sb,
-				       enum bch_sb_features f)
-{
-	if (!bch2_sb_test_feature(sb, f)) {
-		unsigned w = f / 64;
-		unsigned b = f % 64;
-
-		le64_add_cpu(&sb->features[w], 1ULL << b);
-	}
-}
-
 static inline __le64 bch2_sb_magic(struct bch_fs *c)
 {
 	__le64 ret;
@@ -90,6 +70,13 @@ const char *bch2_sb_validate(struct bch_sb_handle *);
 
 int bch2_read_super(const char *, struct bch_opts *, struct bch_sb_handle *);
 int bch2_write_super(struct bch_fs *);
+void __bch2_check_set_feature(struct bch_fs *, unsigned);
+
+static inline void bch2_check_set_feature(struct bch_fs *c, unsigned feat)
+{
+	if (!(c->sb.features & (1ULL << feat)))
+		__bch2_check_set_feature(c, feat);
+}
 
 /* BCH_SB_FIELD_journal: */