diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-08-11 22:22:59 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-08-11 22:25:12 -0400 |
| commit | f3976e3733e97a0e96f5fc6349d1e82b25116043 (patch) | |
| tree | 87ab725ba56735f2157e77dc6bc4bc1c910890b2 /libbcachefs/journal.c | |
| parent | bcee0320dcb53adb3786330a00a101840f2939d0 (diff) | |
Update bcachefs sources to b0788c47d9 bcachefs: Fix check_version_upgrade()
Diffstat (limited to 'libbcachefs/journal.c')
| -rw-r--r-- | libbcachefs/journal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbcachefs/journal.c b/libbcachefs/journal.c index 80a612c0..055920c2 100644 --- a/libbcachefs/journal.c +++ b/libbcachefs/journal.c @@ -63,6 +63,7 @@ journal_seq_to_buf(struct journal *j, u64 seq) static void journal_pin_list_init(struct journal_entry_pin_list *p, int count) { unsigned i; + for (i = 0; i < ARRAY_SIZE(p->list); i++) INIT_LIST_HEAD(&p->list[i]); INIT_LIST_HEAD(&p->flushed); @@ -514,8 +515,7 @@ int bch2_journal_res_get_slowpath(struct journal *j, struct journal_res *res, int ret; closure_wait_event(&j->async_wait, - (ret = __journal_res_get(j, res, flags)) != - -BCH_ERR_journal_res_get_blocked|| + (ret = __journal_res_get(j, res, flags)) != -BCH_ERR_journal_res_get_blocked || (flags & JOURNAL_RES_GET_NONBLOCK)); return ret; } |