bcachefs: Kill reflink option

An option was added to control whether reflink support was on or off
because for a long time, reflink + inline data extent support was
missing - but that's since been fixed, so we can drop the option now.

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

diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h
index 5d0e340c4dcbd94b972b22c9b1afb73ce770eacd..df6961805f6ff5b4691f1579eb814debbd115937 100644 (file)
--- a/fs/bcachefs/bcachefs_format.h
+++ b/fs/bcachefs/bcachefs_format.h
@@ -1313,7 +1313,7 @@ LE64_BITMASK(BCH_SB_PRJQUOTA,             struct bch_sb, flags[0], 59, 60);
 
 LE64_BITMASK(BCH_SB_HAS_ERRORS,                struct bch_sb, flags[0], 60, 61);
 
-LE64_BITMASK(BCH_SB_REFLINK,           struct bch_sb, flags[0], 61, 62);
+/* bit 61 was reflink option */
 LE64_BITMASK(BCH_SB_BIG_ENDIAN,                struct bch_sb, flags[0], 62, 63);
 
 /* 61-64 unused */

diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c
index 8584b90a3df924bd35c647a3761c9592632b39e0..332795eb9ae8f0142f6c983368951b8125efc640 100644 (file)
--- a/fs/bcachefs/fs-io.c
+++ b/fs/bcachefs/fs-io.c
@@ -2870,9 +2870,6 @@ loff_t bch2_remap_file_range(struct file *file_src, loff_t pos_src,
        u64 aligned_len;
        loff_t ret = 0;
 
-       if (!c->opts.reflink)
-               return -EOPNOTSUPP;
-
        if (remap_flags & ~(REMAP_FILE_DEDUP|REMAP_FILE_ADVISORY))
                return -EINVAL;
 

diff --git a/fs/bcachefs/opts.h b/fs/bcachefs/opts.h
index 46f91f19dad426eefe643d83a3408237fea4b2d9..42bf38922d468b3b35a84de6b30b4d30cc0a2c7e 100644 (file)
--- a/fs/bcachefs/opts.h
+++ b/fs/bcachefs/opts.h
@@ -213,11 +213,6 @@ enum opt_type {
          OPT_BOOL(),                                                   \
          BCH_SB_PRJQUOTA,              false,                          \
          NULL,         "Enable project quotas")                        \
-       x(reflink,                      u8,                             \
-         OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,                             \
-         OPT_BOOL(),                                                   \
-         BCH_SB_REFLINK,               true,                           \
-         NULL,         "Enable reflink support")                       \
        x(degraded,                     u8,                             \
          OPT_MOUNT,                                                    \
          OPT_BOOL(),                                                   \

diff --git a/fs/bcachefs/reflink.c b/fs/bcachefs/reflink.c
index a2cc078597f24a6880590c82f7c5772594b2cce8..e0eb2c66300c1283940c08e545461349c6c43c94 100644 (file)
--- a/fs/bcachefs/reflink.c
+++ b/fs/bcachefs/reflink.c
@@ -204,9 +204,6 @@ s64 bch2_remap_range(struct bch_fs *c,
        u64 src_done, dst_done;
        int ret = 0, ret2 = 0;
 
-       if (!c->opts.reflink)
-               return -EOPNOTSUPP;
-
        if (!percpu_ref_tryget(&c->writes))
                return -EROFS;