github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 10:33:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

bcachefs: Fix incorrect multiple dev check in journal write path

Browse Source 
It's uncomon to have multiple devices with journalling only on a subset,
but can be specified with the 'data_allowed' option. We need to know if
we're doing data/metadata writes to multiple devices, as that requires
issuing flushes before the journal writes.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2025-05-27 20:37:50 -04:00
parent 327971cef5
commit 813825d241
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/bcachefs/journal_io.c
View File

@ -1635,6 +1635,16 @@ static int journal_write_alloc(struct journal *j, struct journal_buf *w,
done:
BUG_ON(bkey_val_u64s(&w->key.k) > BCH_REPLICAS_MAX);
#if 0
/*
* XXX: we need a way to alert the user when we go degraded for any
* reason
*/
if (*replicas < min(replicas_want,
dev_mask_nr(&c->rw_devs[BCH_DATA_free]))) {
}
#endif
return *replicas >= replicas_need ? 0 : -BCH_ERR_insufficient_journal_devices;
}
@ -2112,7 +2122,7 @@ CLOSURE_CALLBACK(bch2_journal_write)
struct journal *j = container_of(w, struct journal, buf[w->idx]);
struct bch_fs *c = container_of(j, struct bch_fs, journal);
union bch_replicas_padded replicas;
unsigned nr_rw_members = dev_mask_nr(&c->rw_devs[BCH_DATA_journal]);
unsigned nr_rw_members = dev_mask_nr(&c->rw_devs[BCH_DATA_free]);
int ret;
BUG_ON(BCH_SB_CLEAN(c->disk_sb.sb));