Update bcachefs sources to 1a739db0b256 bcachefs; guard against overflow in btree...

[bcachefs-tools-debian] / libbcachefs / journal.c

diff --git a/libbcachefs/journal.c b/libbcachefs/journal.c
index 8294d7fd6632be802b4fb43302ca0407231fbedd..8538ef34f62bc54e8bc570acbe793e4771745247 100644 (file)
--- a/libbcachefs/journal.c
+++ b/libbcachefs/journal.c
@@ -993,8 +993,7 @@ int bch2_set_nr_journal_buckets(struct bch_fs *c, struct bch_dev *ca,
                        break;
        }
 
-       if (ret)
-               bch_err_fn(c, ret);
+       bch_err_fn(c, ret);
 unlock:
        up_write(&c->state_lock);
        return ret;
@@ -1024,17 +1023,13 @@ int bch2_dev_journal_alloc(struct bch_dev *ca)
 
        ret = __bch2_set_nr_journal_buckets(ca, nr, true, NULL);
 err:
-       if (ret)
-               bch_err_fn(ca, ret);
+       bch_err_fn(ca, ret);
        return ret;
 }
 
 int bch2_fs_journal_alloc(struct bch_fs *c)
 {
-       struct bch_dev *ca;
-       unsigned i;
-
-       for_each_online_member(ca, c, i) {
+       for_each_online_member(c, ca) {
                if (ca->journal.nr)
                        continue;
 
@@ -1299,11 +1294,8 @@ void __bch2_journal_debug_to_text(struct printbuf *out, struct journal *j)
 {
        struct bch_fs *c = container_of(j, struct bch_fs, journal);
        union journal_res_state s;
-       struct bch_dev *ca;
        unsigned long now = jiffies;
        u64 nr_writes = j->nr_flush_writes + j->nr_noflush_writes;
-       u64 seq;
-       unsigned i;
 
        if (!out->nr_tabstops)
                printbuf_tabstop_push(out, 24);
@@ -1348,10 +1340,10 @@ void __bch2_journal_debug_to_text(struct printbuf *out, struct journal *j)
 
        prt_newline(out);
 
-       for (seq = journal_cur_seq(j);
+       for (u64 seq = journal_cur_seq(j);
             seq >= journal_last_unwritten_seq(j);
             --seq) {
-               i = seq & JOURNAL_BUF_MASK;
+               unsigned i = seq & JOURNAL_BUF_MASK;
 
                prt_printf(out, "unwritten entry:");
                prt_tab(out);
@@ -1395,8 +1387,7 @@ void __bch2_journal_debug_to_text(struct printbuf *out, struct journal *j)
               j->space[journal_space_total].next_entry,
               j->space[journal_space_total].total);
 
-       for_each_member_device_rcu(ca, c, i,
-                                  &c->rw_devs[BCH_DATA_journal]) {
+       for_each_member_device_rcu(c, ca, &c->rw_devs[BCH_DATA_journal]) {
                struct journal_device *ja = &ca->journal;
 
                if (!test_bit(ca->dev_idx, c->rw_devs[BCH_DATA_journal].d))
@@ -1405,7 +1396,7 @@ void __bch2_journal_debug_to_text(struct printbuf *out, struct journal *j)
                if (!ja->nr)
                        continue;
 
-               prt_printf(out, "dev %u:\n",            i);
+               prt_printf(out, "dev %u:\n",            ca->dev_idx);
                prt_printf(out, "\tnr\t\t%u\n",         ja->nr);
                prt_printf(out, "\tbucket size\t%u\n",  ca->mi.bucket_size);
                prt_printf(out, "\tavailable\t%u:%u\n", bch2_journal_dev_buckets_available(j, ja, journal_space_discarded), ja->sectors_free);