diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-15 23:45:29 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-15 23:45:29 -0500 |
| commit | e773e86495534ede8efc0f3059cf0939c374a925 (patch) | |
| tree | e928013e6080cd1bb78901a9e29fe000650220ed /libbcachefs/journal_io.c | |
| parent | f2ba586baf981af0e31f160325a51849089f6584 (diff) | |
Update bcachefs sources to 9a555a741e80 bcachefs: omit alignment attribute on big endian struct bkeyv1.6.2
Diffstat (limited to 'libbcachefs/journal_io.c')
| -rw-r--r-- | libbcachefs/journal_io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbcachefs/journal_io.c b/libbcachefs/journal_io.c index 057e7c61..16c1249c 100644 --- a/libbcachefs/journal_io.c +++ b/libbcachefs/journal_io.c @@ -1506,8 +1506,8 @@ static int journal_write_alloc(struct journal *j, struct journal_buf *w) c->opts.foreground_target; unsigned i, replicas = 0, replicas_want = READ_ONCE(c->opts.metadata_replicas); - unsigned replicas_need = min(replicas_want, - READ_ONCE(c->opts.metadata_replicas_required)); + unsigned replicas_need = min_t(unsigned, replicas_want, + READ_ONCE(c->opts.metadata_replicas_required)); rcu_read_lock(); retry: |