bcachefs: Add verbose log messages for journal read

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>

diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h
index 7c48ebe..2dd3a0a 100644 (file)
--- a/fs/bcachefs/bcachefs.h
+++ b/fs/bcachefs/bcachefs.h
@@ -177,7 +177,11 @@
  */
 
 #undef pr_fmt
+#ifdef __KERNEL__
 #define pr_fmt(fmt) "bcachefs: %s() " fmt "\n", __func__
+#else
+#define pr_fmt(fmt) "%s() " fmt "\n", __func__
+#endif
 
 #include <linux/backing-dev-defs.h>
 #include <linux/bug.h>

diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c
index 22feea7..c659a5a 100644 (file)
--- a/fs/bcachefs/journal_io.c
+++ b/fs/bcachefs/journal_io.c
@@ -892,6 +892,7 @@ static void bch2_journal_read_device(struct closure *cl)
        struct journal_device *ja =
                container_of(cl, struct journal_device, read);
        struct bch_dev *ca = container_of(ja, struct bch_dev, journal);
+       struct bch_fs *c = ca->fs;
        struct journal_list *jlist =
                container_of(cl->parent, struct journal_list, cl);
        struct journal_read_buf buf = { NULL, 0 };
@@ -943,6 +944,7 @@ static void bch2_journal_read_device(struct closure *cl)
        ja->discard_idx = ja->dirty_idx_ondisk =
                ja->dirty_idx = (ja->cur_idx + 1) % ja->nr;
 out:
+       bch_verbose(c, "journal read done on device %s, ret %i", ca->name, ret);
        kvpfree(buf.data, buf.size);
        percpu_ref_put(&ca->io_ref);
        closure_return(cl);

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index e4ba3f0..d11457c 100644 (file)
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -1008,6 +1008,7 @@ int bch2_fs_recovery(struct bch_fs *c)
        if (!c->sb.clean || c->opts.fsck || c->opts.keep_journal) {
                struct journal_replay *i;
 
+               bch_verbose(c, "starting journal read");
                ret = bch2_journal_read(c, &c->journal_entries,
                                        &blacklist_seq, &journal_seq);
                if (ret)