#include "libbcachefs/buckets.h"
#include "libbcachefs/error.h"
#include "libbcachefs/journal.h"
+#include "libbcachefs/journal_io.h"
#include "libbcachefs/super.h"
static void dump_usage(void)
/* Btree: */
for (i = 0; i < BTREE_ID_NR; i++) {
const struct bch_extent_ptr *ptr;
- struct btree_iter iter;
+ struct bkey_ptrs_c ptrs;
+ struct btree_trans trans;
+ struct btree_iter *iter;
struct btree *b;
- for_each_btree_node(&iter, c, i, POS_MIN, 0, b) {
- struct bkey_s_c_extent e = bkey_i_to_s_c_extent(&b->key);
+ bch2_trans_init(&trans, c, 0, 0);
- extent_for_each_ptr(e, ptr)
+ __for_each_btree_node(&trans, iter, i, POS_MIN, 0, 1, 0, b) {
+ struct btree_node_iter iter;
+ struct bkey u;
+ struct bkey_s_c k;
+
+ for_each_btree_node_key_unpack(b, k, &iter, &u) {
+ ptrs = bch2_bkey_ptrs_c(k);
+
+ bkey_for_each_ptr(ptrs, ptr)
+ if (ptr->dev == ca->dev_idx)
+ range_add(&data,
+ ptr->offset << 9,
+ btree_bytes(c));
+ }
+ }
+
+ b = c->btree_roots[i].b;
+ if (!btree_node_fake(b)) {
+ ptrs = bch2_bkey_ptrs_c(bkey_i_to_s_c(&b->key));
+
+ bkey_for_each_ptr(ptrs, ptr)
if (ptr->dev == ca->dev_idx)
range_add(&data,
ptr->offset << 9,
- b->written << 9);
+ btree_bytes(c));
}
- bch2_btree_iter_unlock(&iter);
+ bch2_trans_exit(&trans);
}
qcow2_write_image(ca->disk_sb.bdev->bd_fd, fd, &data,
int fd, opt;
opt_set(opts, nochanges, true);
- opt_set(opts, noreplay, true);
+ opt_set(opts, norecovery, true);
opt_set(opts, degraded, true);
opt_set(opts, errors, BCH_ON_ERROR_CONTINUE);
+ opt_set(opts, fix_errors, FSCK_OPT_YES);
- while ((opt = getopt(argc, argv, "o:fh")) != -1)
+ while ((opt = getopt(argc, argv, "o:fvh")) != -1)
switch (opt) {
case 'o':
out = optarg;
case 'f':
force = true;
break;
+ case 'v':
+ opt_set(opts, verbose, true);
+ break;
case 'h':
dump_usage();
exit(EXIT_SUCCESS);
static void list_keys(struct bch_fs *c, enum btree_id btree_id,
struct bpos start, struct bpos end)
{
- struct btree_iter iter;
+ struct btree_trans trans;
+ struct btree_iter *iter;
struct bkey_s_c k;
char buf[512];
+ int ret;
+
+ bch2_trans_init(&trans, c, 0, 0);
- for_each_btree_key(&iter, c, btree_id, start,
- BTREE_ITER_PREFETCH, k) {
+ for_each_btree_key(&trans, iter, btree_id, start,
+ BTREE_ITER_PREFETCH, k, ret) {
if (bkey_cmp(k.k->p, end) > 0)
break;
bch2_bkey_val_to_text(&PBUF(buf), c, k);
puts(buf);
}
- bch2_btree_iter_unlock(&iter);
+ bch2_trans_exit(&trans);
}
static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id,
struct bpos start, struct bpos end)
{
- struct btree_iter iter;
+ struct btree_trans trans;
+ struct btree_iter *iter;
struct btree *b;
char buf[4096];
- for_each_btree_node(&iter, c, btree_id, start, 0, b) {
+ bch2_trans_init(&trans, c, 0, 0);
+
+ for_each_btree_node(&trans, iter, btree_id, start, 0, b) {
if (bkey_cmp(b->key.k.p, end) > 0)
break;
bch2_btree_node_to_text(&PBUF(buf), c, b);
puts(buf);
}
- bch2_btree_iter_unlock(&iter);
+ bch2_trans_exit(&trans);
+}
+
+static void list_nodes(struct bch_fs *c, enum btree_id btree_id,
+ struct bpos start, struct bpos end)
+{
+ struct btree_trans trans;
+ struct btree_iter *iter;
+ struct btree *b;
+ char buf[4096];
+
+ bch2_trans_init(&trans, c, 0, 0);
+
+ for_each_btree_node(&trans, iter, btree_id, start, 0, b) {
+ if (bkey_cmp(b->key.k.p, end) > 0)
+ break;
+
+ bch2_bkey_val_to_text(&PBUF(buf), c, bkey_i_to_s_c(&b->key));
+ fputs(buf, stdout);
+ putchar('\n');
+ }
+ bch2_trans_exit(&trans);
}
static void list_nodes_keys(struct bch_fs *c, enum btree_id btree_id,
struct bpos start, struct bpos end)
{
- struct btree_iter iter;
+ struct btree_trans trans;
+ struct btree_iter *iter;
struct btree_node_iter node_iter;
struct bkey unpacked;
struct bkey_s_c k;
struct btree *b;
char buf[4096];
- for_each_btree_node(&iter, c, btree_id, start, 0, b) {
+ bch2_trans_init(&trans, c, 0, 0);
+
+ for_each_btree_node(&trans, iter, btree_id, start, 0, b) {
if (bkey_cmp(b->key.k.p, end) > 0)
break;
puts(buf);
}
}
- bch2_btree_iter_unlock(&iter);
+ bch2_trans_exit(&trans);
}
static struct bpos parse_pos(char *buf)
"keys",
"formats",
"nodes",
+ "nodes_keys",
NULL
};
int cmd_list(int argc, char *argv[])
{
struct bch_opts opts = bch2_opts_empty();
- enum btree_id btree_id = BTREE_ID_EXTENTS;
+ enum btree_id btree_id_start = 0;
+ enum btree_id btree_id_end = BTREE_ID_NR;
+ enum btree_id btree_id;
struct bpos start = POS_MIN, end = POS_MAX;
u64 inum;
int mode = 0, opt;
while ((opt = getopt(argc, argv, "b:s:e:i:m:fvh")) != -1)
switch (opt) {
case 'b':
- btree_id = read_string_list_or_die(optarg,
+ btree_id_start = read_string_list_or_die(optarg,
bch2_btree_ids, "btree id");
+ btree_id_end = btree_id_start + 1;
break;
case 's':
start = parse_pos(optarg);
opt_set(opts, norecovery, false);
break;
case 'v':
- opt_set(opts, verbose_recovery, true);
+ opt_set(opts, verbose, true);
break;
case 'h':
list_keys_usage();
if (IS_ERR(c))
die("error opening %s: %s", argv[0], strerror(-PTR_ERR(c)));
- switch (mode) {
- case 0:
- list_keys(c, btree_id, start, end);
- break;
- case 1:
- list_btree_formats(c, btree_id, start, end);
- break;
- case 2:
- list_nodes_keys(c, btree_id, start, end);
- break;
- default:
- die("Invalid mode");
+
+ for (btree_id = btree_id_start;
+ btree_id < btree_id_end;
+ btree_id++) {
+ switch (mode) {
+ case 0:
+ list_keys(c, btree_id, start, end);
+ break;
+ case 1:
+ list_btree_formats(c, btree_id, start, end);
+ break;
+ case 2:
+ list_nodes(c, btree_id, start, end);
+ break;
+ case 3:
+ list_nodes_keys(c, btree_id, start, end);
+ break;
+ default:
+ die("Invalid mode");
+ }
+ }
+
+ bch2_fs_stop(c);
+ return 0;
+}
+
+static void list_journal_usage(void)
+{
+ puts("bcachefs list_journal - print contents of journal\n"
+ "Usage: bcachefs list_journal [OPTION]... <devices>\n"
+ "\n"
+ "Options:\n"
+ " -a Read entire journal, not just dirty entries\n"
+ " -h Display this help and exit\n"
+ "Report bugs to <linux-bcache@vger.kernel.org>");
+}
+
+int cmd_list_journal(int argc, char *argv[])
+{
+ struct bch_opts opts = bch2_opts_empty();
+ int opt;
+
+ opt_set(opts, nochanges, true);
+ opt_set(opts, norecovery, true);
+ opt_set(opts, degraded, true);
+ opt_set(opts, errors, BCH_ON_ERROR_CONTINUE);
+ opt_set(opts, fix_errors, FSCK_OPT_YES);
+ opt_set(opts, keep_journal, true);
+
+ while ((opt = getopt(argc, argv, "ah")) != -1)
+ switch (opt) {
+ case 'a':
+ opt_set(opts, read_entire_journal, true);
+ break;
+ case 'h':
+ list_journal_usage();
+ exit(EXIT_SUCCESS);
+ }
+ args_shift(optind);
+
+ if (!argc)
+ die("Please supply device(s) to open");
+
+ struct bch_fs *c = bch2_fs_open(argv, argc, opts);
+ if (IS_ERR(c))
+ die("error opening %s: %s", argv[0], strerror(-PTR_ERR(c)));
+
+ struct journal_replay *p;
+ struct jset_entry *entry;
+ struct bkey_i *k, *_n;
+
+ /* This could be greatly expanded: */
+
+ list_for_each_entry(p, &c->journal_entries, list) {
+ printf("journal entry %8llu\n"
+ " version %8u\n"
+ " last seq %8llu\n"
+ " read clock %8u\n"
+ " write clock %8u\n"
+ ,
+ le64_to_cpu(p->j.seq),
+ le32_to_cpu(p->j.seq),
+ le64_to_cpu(p->j.last_seq),
+ le16_to_cpu(p->j.read_clock),
+ le16_to_cpu(p->j.write_clock));
+
+ for_each_jset_key(k, _n, entry, &p->j) {
+ char buf[200];
+
+ bch2_bkey_val_to_text(&PBUF(buf), c, bkey_i_to_s_c(k));
+ printf("btree %s l %u: %s\n",
+ bch2_btree_ids[entry->btree_id],
+ entry->level,
+ buf);
+ }
}
bch2_fs_stop(c);
projects / bcachefs-tools-debian / blobdiff