diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-03-15 17:26:19 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:56 -0400 |
| commit | 87a432f5d7ee2b2baef6d7e115ceafa18e80f3a3 (patch) | |
| tree | 0db69e747f1934901692b56c9c97b6858a36cc7a | |
| parent | 5ff75ccbbc3f262158e5bf02c639539a4da93a43 (diff) | |
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>
| -rw-r--r-- | fs/bcachefs/bcachefs_format.h | 2 | ||||
| -rw-r--r-- | fs/bcachefs/fs-io.c | 3 | ||||
| -rw-r--r-- | fs/bcachefs/opts.h | 5 | ||||
| -rw-r--r-- | fs/bcachefs/reflink.c | 3 |
4 files changed, 1 insertions, 12 deletions
diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h index 5d0e340c4dcb..df6961805f6f 100644 --- 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 8584b90a3df9..332795eb9ae8 100644 --- 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 46f91f19dad4..42bf38922d46 100644 --- 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 a2cc078597f2..e0eb2c66300c 100644 --- 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; |