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

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

diff --git a/libbcachefs/journal_reclaim.c b/libbcachefs/journal_reclaim.c
index 60b9d357238754b5d1162570a593c26b690562f5..820d25e19e5fe3ee6a45e70f23eb74fc1d558e88 100644 (file)
--- a/libbcachefs/journal_reclaim.c
+++ b/libbcachefs/journal_reclaim.c
@@ -136,15 +136,13 @@ static struct journal_space __journal_space_available(struct journal *j, unsigne
                            enum journal_space_from from)
 {
        struct bch_fs *c = container_of(j, struct bch_fs, journal);
-       struct bch_dev *ca;
-       unsigned i, pos, nr_devs = 0;
+       unsigned pos, nr_devs = 0;
        struct journal_space space, dev_space[BCH_SB_MEMBERS_MAX];
 
        BUG_ON(nr_devs_want > ARRAY_SIZE(dev_space));
 
        rcu_read_lock();
-       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]) {
                if (!ca->journal.nr)
                        continue;
 
@@ -173,19 +171,17 @@ static struct journal_space __journal_space_available(struct journal *j, unsigne
 void bch2_journal_space_available(struct journal *j)
 {
        struct bch_fs *c = container_of(j, struct bch_fs, journal);
-       struct bch_dev *ca;
        unsigned clean, clean_ondisk, total;
        unsigned max_entry_size  = min(j->buf[0].buf_size >> 9,
                                       j->buf[1].buf_size >> 9);
-       unsigned i, nr_online = 0, nr_devs_want;
+       unsigned nr_online = 0, nr_devs_want;
        bool can_discard = false;
        int ret = 0;
 
        lockdep_assert_held(&j->lock);
 
        rcu_read_lock();
-       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 (!ja->nr)
@@ -216,7 +212,7 @@ void bch2_journal_space_available(struct journal *j)
 
        nr_devs_want = min_t(unsigned, nr_online, c->opts.metadata_replicas);
 
-       for (i = 0; i < journal_space_nr; i++)
+       for (unsigned i = 0; i < journal_space_nr; i++)
                j->space[i] = __journal_space_available(j, nr_devs_want, i);
 
        clean_ondisk    = j->space[journal_space_clean_ondisk].total;
@@ -263,12 +259,10 @@ static bool should_discard_bucket(struct journal *j, struct journal_device *ja)
 void bch2_journal_do_discards(struct journal *j)
 {
        struct bch_fs *c = container_of(j, struct bch_fs, journal);
-       struct bch_dev *ca;
-       unsigned iter;
 
        mutex_lock(&j->discard_lock);
 
-       for_each_rw_member(ca, c, iter) {
+       for_each_rw_member(c, ca) {
                struct journal_device *ja = &ca->journal;
 
                while (should_discard_bucket(j, ja)) {
@@ -583,13 +577,11 @@ static size_t journal_flush_pins(struct journal *j,
 static u64 journal_seq_to_flush(struct journal *j)
 {
        struct bch_fs *c = container_of(j, struct bch_fs, journal);
-       struct bch_dev *ca;
        u64 seq_to_flush = 0;
-       unsigned iter;
 
        spin_lock(&j->lock);
 
-       for_each_rw_member(ca, c, iter) {
+       for_each_rw_member(c, ca) {
                struct journal_device *ja = &ca->journal;
                unsigned nr_buckets, bucket_to_flush;
 
@@ -793,10 +785,9 @@ int bch2_journal_reclaim_start(struct journal *j)
        p = kthread_create(bch2_journal_reclaim_thread, j,
                           "bch-reclaim/%s", c->name);
        ret = PTR_ERR_OR_ZERO(p);
-       if (ret) {
-               bch_err_msg(c, ret, "creating journal reclaim thread");
+       bch_err_msg(c, ret, "creating journal reclaim thread");
+       if (ret)
                return ret;
-       }
 
        get_task_struct(p);
        j->reclaim_thread = p;