Update bcachefs sources to 84f132d569 bcachefs: fsck: Break walk_inode() up into...

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

diff --git a/libbcachefs/journal.c b/libbcachefs/journal.c
index 433c97844f36f7058f5501600e6651f256706add..dc34aba2d259be9b53ee81f4ae5b2f98f6da1891 100644 (file)
--- a/libbcachefs/journal.c
+++ b/libbcachefs/journal.c
@@ -828,7 +828,7 @@ static int __bch2_set_nr_journal_buckets(struct bch_dev *ca, unsigned nr,
                                break;
                        }
                } else {
-                       ob[nr_got] = bch2_bucket_alloc(c, ca, RESERVE_none, cl);
+                       ob[nr_got] = bch2_bucket_alloc(c, ca, BCH_WATERMARK_normal, cl);
                        ret = PTR_ERR_OR_ZERO(ob[nr_got]);
                        if (ret)
                                break;
@@ -978,7 +978,7 @@ int bch2_set_nr_journal_buckets(struct bch_fs *c, struct bch_dev *ca,
        }
 
        if (ret)
-               bch_err(c, "%s: err %s", __func__, bch2_err_str(ret));
+               bch_err_fn(c, ret);
 unlock:
        up_write(&c->state_lock);
        return ret;
@@ -987,9 +987,12 @@ unlock:
 int bch2_dev_journal_alloc(struct bch_dev *ca)
 {
        unsigned nr;
+       int ret;
 
-       if (dynamic_fault("bcachefs:add:journal_alloc"))
-               return -BCH_ERR_ENOMEM_set_nr_journal_buckets;
+       if (dynamic_fault("bcachefs:add:journal_alloc")) {
+               ret = -BCH_ERR_ENOMEM_set_nr_journal_buckets;
+               goto err;
+       }
 
        /* 1/128th of the device by default: */
        nr = ca->mi.nbuckets >> 7;
@@ -1003,7 +1006,11 @@ int bch2_dev_journal_alloc(struct bch_dev *ca)
                     min(1 << 13,
                         (1 << 24) / ca->mi.bucket_size));
 
-       return __bch2_set_nr_journal_buckets(ca, nr, true, NULL);
+       ret = __bch2_set_nr_journal_buckets(ca, nr, true, NULL);
+err:
+       if (ret)
+               bch_err_fn(ca, ret);
+       return ret;
 }
 
 /* startup/shutdown: */