From: Kent Overstreet Date: Tue, 2 Jun 2020 20:30:54 +0000 (-0400) Subject: bcachefs: Add an option to disable reflink support X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=36b8372b595748d37dcdcd915c176bada978fbe5;p=linux.git bcachefs: Add an option to disable reflink support Reflink might be buggy, so we're adding an option so users can help bisect what's going on. Signed-off-by: Kent Overstreet Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h index f0f8964a98b12..14eca567a10da 100644 --- a/fs/bcachefs/bcachefs_format.h +++ b/fs/bcachefs/bcachefs_format.h @@ -1266,6 +1266,8 @@ 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); + /* 61-64 unused */ LE64_BITMASK(BCH_SB_STR_HASH_TYPE, struct bch_sb, flags[1], 0, 4); diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c index 7ce6d71aca29c..98fe1ec7867d9 100644 --- a/fs/bcachefs/fs-io.c +++ b/fs/bcachefs/fs-io.c @@ -2812,6 +2812,9 @@ 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 1e579f67346a2..fe457117bf895 100644 --- a/fs/bcachefs/opts.h +++ b/fs/bcachefs/opts.h @@ -207,6 +207,11 @@ 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 2f223be74926b..3c473f1380a6b 100644 --- a/fs/bcachefs/reflink.c +++ b/fs/bcachefs/reflink.c @@ -167,6 +167,9 @@ 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;