bcachefs: respect superblock discard flag.
authorDaniel Hill <daniel@gluo.nz>
Sat, 5 Mar 2022 04:45:27 +0000 (17:45 +1300)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:09:26 +0000 (17:09 -0400)
We were accidentally using default mount options and overwriting the
discard flag.

Signed-off-by: Daniel Hill <daniel@gluo.nz>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/super.c

index 27716d6..0bc78c5 100644 (file)
@@ -1167,9 +1167,6 @@ static struct bch_dev *__bch2_dev_alloc(struct bch_fs *c,
        ca->mi = bch2_mi_to_cpu(member);
        ca->uuid = member->uuid;
 
-       if (opt_defined(c->opts, discard))
-               ca->mi.discard = opt_get(c->opts, discard);
-
        if (percpu_ref_init(&ca->ref, bch2_dev_ref_complete,
                            0, GFP_KERNEL) ||
            percpu_ref_init(&ca->io_ref, bch2_dev_io_ref_complete,