bcachefs: promote_whole_extents is now a normal option

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

diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h
index ffc90615eba4e6b1c1116709b884c40c623acd1e..a4773b034f912019c75a62032e5145b72a9dede6 100644 (file)
--- a/fs/bcachefs/bcachefs.h
+++ b/fs/bcachefs/bcachefs.h
@@ -1086,7 +1086,6 @@ struct bch_fs {
        u64 __percpu            *counters;
 
        unsigned                copy_gc_enabled:1;
-       bool                    promote_whole_extents;
 
        struct bch2_time_stats  times[BCH_TIME_STAT_NR];
 

diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h
index 14ce726bf5a3cce27152e31c82e7a976bfb6005a..8c4addddd07e0967f0e64614ccab6ce84c48f688 100644 (file)
--- a/fs/bcachefs/bcachefs_format.h
+++ b/fs/bcachefs/bcachefs_format.h
@@ -795,6 +795,8 @@ LE64_BITMASK(BCH_SB_HAS_ERRORS,             struct bch_sb, flags[0], 60, 61);
 LE64_BITMASK(BCH_SB_HAS_TOPOLOGY_ERRORS,struct bch_sb, flags[0], 61, 62);
 
 LE64_BITMASK(BCH_SB_BIG_ENDIAN,                struct bch_sb, flags[0], 62, 63);
+LE64_BITMASK(BCH_SB_PROMOTE_WHOLE_EXTENTS,
+                                       struct bch_sb, flags[0], 63, 64);
 
 LE64_BITMASK(BCH_SB_STR_HASH_TYPE,     struct bch_sb, flags[1],  0,  4);
 LE64_BITMASK(BCH_SB_COMPRESSION_TYPE_LO,struct bch_sb, flags[1],  4,  8);

diff --git a/fs/bcachefs/io_read.c b/fs/bcachefs/io_read.c
index 808017873d075b89d1fb243fe1feff9209294a96..ce27ba1f0b54653cc73b9a7de2d221c4c85174eb 100644 (file)
--- a/fs/bcachefs/io_read.c
+++ b/fs/bcachefs/io_read.c
@@ -286,7 +286,7 @@ static struct promote_op *promote_alloc(struct btree_trans *trans,
         */
        bool promote_full = (failed ||
                             *read_full ||
-                            READ_ONCE(c->promote_whole_extents));
+                            READ_ONCE(c->opts.promote_whole_extents));
        /* data might have to be decompressed in the write path: */
        unsigned sectors = promote_full
                ? max(pick->crc.compressed_size, pick->crc.live_size)

diff --git a/fs/bcachefs/opts.h b/fs/bcachefs/opts.h
index 0138717e9f77a9142ee10d7a235111f403b837c7..3d83bcdca69d9a9a7cdf99c4331f4a302a6ac989 100644 (file)
--- a/fs/bcachefs/opts.h
+++ b/fs/bcachefs/opts.h
@@ -265,6 +265,11 @@ enum fsck_err_opts {
          OPT_BOOL(),                                                   \
          BCH2_NO_SB_OPT,               true,                           \
          NULL,         "Enable inline data extents")                   \
+       x(promote_whole_extents,        u8,                             \
+         OPT_FS|OPT_MOUNT|OPT_RUNTIME,                                 \
+         OPT_BOOL(),                                                   \
+         BCH_SB_PROMOTE_WHOLE_EXTENTS, true,                           \
+         NULL,         "Promote whole extents, instead of just part being read")\
        x(acl,                          u8,                             \
          OPT_FS|OPT_FORMAT|OPT_MOUNT,                                  \
          OPT_BOOL(),                                                   \

diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c
index c8c2ccbdfbb5891faa1de7e2c5ca2a50724a93ec..2a72782d6d170cdb810efa8f88303ab428d1397c 100644 (file)
--- a/fs/bcachefs/super-io.c
+++ b/fs/bcachefs/super-io.c
@@ -418,6 +418,9 @@ static int bch2_sb_validate(struct bch_sb_handle *disk_sb,
                if (le16_to_cpu(sb->version) <= bcachefs_metadata_version_disk_accounting_v2 &&
                    !BCH_SB_ALLOCATOR_STUCK_TIMEOUT(sb))
                        SET_BCH_SB_ALLOCATOR_STUCK_TIMEOUT(sb, 30);
+
+               if (le16_to_cpu(sb->version) <= bcachefs_metadata_version_disk_accounting_v2)
+                       SET_BCH_SB_PROMOTE_WHOLE_EXTENTS(sb, true);
        }
 
        for (opt_id = 0; opt_id < bch2_opts_nr; opt_id++) {

diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c
index 6d0ce3d73450b60994acdf7004f510fdcea42b56..d8adf465f8b8126edf717af6dd5f083c8f81d406 100644 (file)
--- a/fs/bcachefs/super.c
+++ b/fs/bcachefs/super.c
@@ -811,7 +811,6 @@ static struct bch_fs *bch2_fs_alloc(struct bch_sb *sb, struct bch_opts opts)
 
        c->copy_gc_enabled              = 1;
        c->rebalance.enabled            = 1;
-       c->promote_whole_extents        = true;
 
        c->journal.flush_write_time     = &c->times[BCH_TIME_journal_flush_write];
        c->journal.noflush_write_time   = &c->times[BCH_TIME_journal_noflush_write];

diff --git a/fs/bcachefs/sysfs.c b/fs/bcachefs/sysfs.c
index 800a3970a242e422c5e62a29a0c36ad360eabd29..7ff9afcb37b2c17fbb152785a7c4f40afb1855a4 100644 (file)
--- a/fs/bcachefs/sysfs.c
+++ b/fs/bcachefs/sysfs.c
@@ -219,7 +219,6 @@ read_attribute(copy_gc_wait);
 rw_attribute(rebalance_enabled);
 sysfs_pd_controller_attribute(rebalance);
 read_attribute(rebalance_status);
-rw_attribute(promote_whole_extents);
 
 read_attribute(new_stripes);
 
@@ -347,8 +346,6 @@ SHOW(bch2_fs)
        if (attr == &sysfs_rebalance_status)
                bch2_rebalance_status_to_text(out, c);
 
-       sysfs_print(promote_whole_extents,      c->promote_whole_extents);
-
        /* Debugging: */
 
        if (attr == &sysfs_journal_debug)
@@ -436,8 +433,6 @@ STORE(bch2_fs)
 
        sysfs_pd_controller_store(rebalance,    &c->rebalance.pd);
 
-       sysfs_strtoul(promote_whole_extents,    c->promote_whole_extents);
-
        /* Debugging: */
 
        if (!test_bit(BCH_FS_started, &c->flags))
@@ -514,7 +509,6 @@ struct attribute *bch2_fs_files[] = {
        &sysfs_btree_cache_size,
        &sysfs_btree_write_stats,
 
-       &sysfs_promote_whole_extents,
        &sysfs_rebalance_status,
 
        &sysfs_compression_stats,