diff options
author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-24 01:26:40 -0500 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-24 01:26:40 -0500 |
commit | 03272a1e5559ce508400862285b8a3f05c500955 (patch) | |
tree | 64518b8cae701eb751fcf341da5e7178a49b3021 /libbcachefs/alloc_background.c | |
parent | 010182e79051fccbedc35aaa55dc67266ae3b3d0 (diff) |
Update bcachefs sources to a623b3063d5d bcachefs: Fix check_snapshot() memcpy
Diffstat (limited to 'libbcachefs/alloc_background.c')
-rw-r--r-- | libbcachefs/alloc_background.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libbcachefs/alloc_background.c b/libbcachefs/alloc_background.c index 4de4036d..ccd6cbfd 100644 --- a/libbcachefs/alloc_background.c +++ b/libbcachefs/alloc_background.c @@ -1878,10 +1878,11 @@ static void bch2_do_discards_fast_work(struct work_struct *work) if (!got_bucket) break; - blkdev_issue_discard(ca->disk_sb.bdev, - bucket.offset * ca->mi.bucket_size, - ca->mi.bucket_size, - GFP_KERNEL); + if (ca->mi.discard && !c->opts.nochanges) + blkdev_issue_discard(ca->disk_sb.bdev, + bucket.offset * ca->mi.bucket_size, + ca->mi.bucket_size, + GFP_KERNEL); int ret = bch2_trans_do(c, NULL, NULL, BCH_WATERMARK_btree| |