#include <sys/types.h>
#include "cmds.h"
-#include "libbcache.h"
+#include "libbcachefs.h"
#include "qcow2.h"
#include "tools-util.h"
-#include "bcache.h"
-#include "alloc.h"
-#include "btree_cache.h"
-#include "btree_iter.h"
-#include "buckets.h"
-#include "journal.h"
-#include "super.h"
+#include "libbcachefs/bcachefs.h"
+#include "libbcachefs/bset.h"
+#include "libbcachefs/btree_cache.h"
+#include "libbcachefs/btree_iter.h"
+#include "libbcachefs/buckets.h"
+#include "libbcachefs/error.h"
+#include "libbcachefs/journal.h"
+#include "libbcachefs/super.h"
static void dump_usage(void)
{
- puts("bcache dump - dump filesystem metadata\n"
- "Usage: bcache dump [OPTION]... <devices>\n"
+ puts("bcachefs dump - dump filesystem metadata\n"
+ "Usage: bcachefs dump [OPTION]... <devices>\n"
"\n"
"Options:\n"
" -o output Output qcow2 image(s)\n"
+ " -f Force; overwrite when needed\n"
" -h Display this help and exit\n"
"Report bugs to <linux-bcache@vger.kernel.org>");
}
-void dump_one_device(struct cache_set *c, struct cache *ca, int fd)
+static void dump_one_device(struct bch_fs *c, struct bch_dev *ca, int fd)
{
- struct cache_sb *sb = ca->disk_sb.sb;
- sparse_data data;
+ struct bch_sb *sb = ca->disk_sb.sb;
+ ranges data;
unsigned i;
darray_init(data);
/* Superblock: */
- data_add(&data, SB_SECTOR << 9, __set_bytes(sb, le16_to_cpu(sb->u64s)));
+ range_add(&data, BCH_SB_LAYOUT_SECTOR << 9,
+ sizeof(struct bch_sb_layout));
+
+ for (i = 0; i < sb->layout.nr_superblocks; i++)
+ range_add(&data,
+ le64_to_cpu(sb->layout.sb_offset[i]) << 9,
+ vstruct_bytes(sb));
/* Journal: */
- for (i = 0; i < bch_nr_journal_buckets(ca->disk_sb.sb); i++)
+ for (i = 0; i < ca->journal.nr; i++)
if (ca->journal.bucket_seq[i] >= c->journal.last_seq_ondisk) {
- u64 bucket = journal_bucket(ca->disk_sb.sb, i);
+ u64 bucket = ca->journal.buckets[i];
- data_add(&data,
- bucket_bytes(ca) * bucket,
- bucket_bytes(ca));
+ range_add(&data,
+ bucket_bytes(ca) * bucket,
+ bucket_bytes(ca));
}
- /* Prios/gens: */
- for (i = 0; i < prio_buckets(ca); i++)
- data_add(&data,
- bucket_bytes(ca) * ca->prio_last_buckets[i],
- bucket_bytes(ca));
-
/* Btree: */
for (i = 0; i < BTREE_ID_NR; i++) {
const struct bch_extent_ptr *ptr;
- struct btree_iter iter;
+ struct btree_trans trans;
+ struct btree_iter *iter;
struct btree *b;
- for_each_btree_node(&iter, c, i, POS_MIN, 0, b) {
+ bch2_trans_init(&trans, c, 0, 0);
+
+ for_each_btree_node(&trans, iter, i, POS_MIN, 0, b) {
struct bkey_s_c_extent e = bkey_i_to_s_c_extent(&b->key);
extent_for_each_ptr(e, ptr)
- if (ptr->dev == ca->sb.nr_this_dev)
- data_add(&data,
- ptr->offset << 9,
- b->written << 9);
+ if (ptr->dev == ca->dev_idx)
+ range_add(&data,
+ ptr->offset << 9,
+ b->written << 9);
}
- bch_btree_iter_unlock(&iter);
+ bch2_trans_exit(&trans);
}
qcow2_write_image(ca->disk_sb.bdev->bd_fd, fd, &data,
int cmd_dump(int argc, char *argv[])
{
- DECLARE_COMPLETION_ONSTACK(shutdown);
- struct cache_set_opts opts = cache_set_opts_empty();
- struct cache_set *c = NULL;
- const char *err;
- char *out = NULL, *buf;
+ struct bch_opts opts = bch2_opts_empty();
+ struct bch_dev *ca;
+ char *out = NULL;
unsigned i, nr_devices = 0;
bool force = false;
int fd, opt;
- opts.nochanges = true;
- opts.noreplay = true;
- opts.errors = BCH_ON_ERROR_CONTINUE;
- fsck_err_opt = FSCK_ERR_NO;
+ 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);
while ((opt = getopt(argc, argv, "o:fh")) != -1)
switch (opt) {
dump_usage();
exit(EXIT_SUCCESS);
}
-
- if (optind >= argc)
- die("Please supply device(s) to check");
+ args_shift(optind);
if (!out)
die("Please supply output filename");
- buf = alloca(strlen(out) + 10);
- strcpy(buf, out);
+ if (!argc)
+ die("Please supply device(s) to check");
- err = bch_register_cache_set(argv + optind, argc - optind, opts, &c);
- if (err)
- die("error opening %s: %s", argv[optind], err);
+ 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)));
down_read(&c->gc_lock);
- for (i = 0; i < c->sb.nr_in_set; i++)
- if (c->cache[i])
- nr_devices++;
+ for_each_online_member(ca, c, i)
+ nr_devices++;
BUG_ON(!nr_devices);
- for (i = 0; i < c->sb.nr_in_set; i++) {
- int mode = O_WRONLY|O_CREAT|O_TRUNC;
+ for_each_online_member(ca, c, i) {
+ int flags = O_WRONLY|O_CREAT|O_TRUNC;
if (!force)
- mode |= O_EXCL;
+ flags |= O_EXCL;
- if (!c->cache[i])
+ if (!c->devs[i])
continue;
- if (nr_devices > 1)
- sprintf(buf, "%s.%u", out, i);
-
- fd = open(buf, mode, 0600);
- if (fd < 0)
- die("error opening %s: %s", buf, strerror(errno));
+ char *path = nr_devices > 1
+ ? mprintf("%s.%u", out, i)
+ : strdup(out);
+ fd = xopen(path, flags, 0600);
+ free(path);
- dump_one_device(c, c->cache[i], fd);
+ dump_one_device(c, ca, fd);
close(fd);
}
up_read(&c->gc_lock);
- c->stop_completion = &shutdown;
- bch_cache_set_stop(c);
- closure_put(&c->cl);
- wait_for_completion(&shutdown);
+ bch2_fs_stop(c);
return 0;
}
-void list_keys(struct cache_set *c, enum btree_id btree_id,
- struct bpos start, struct bpos end, int mode)
+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;
- for_each_btree_key(&iter, c, btree_id, start, k) {
+ bch2_trans_init(&trans, c, 0, 0);
+
+ for_each_btree_key(&trans, iter, btree_id, start,
+ BTREE_ITER_PREFETCH, k, ret) {
if (bkey_cmp(k.k->p, end) > 0)
break;
- bch_bkey_val_to_text(c, bkey_type(0, btree_id),
- buf, sizeof(buf), k);
+ bch2_bkey_val_to_text(&PBUF(buf), c, k);
puts(buf);
}
- bch_btree_iter_unlock(&iter);
+ bch2_trans_exit(&trans);
}
-void list_btree_formats(struct cache_set *c, enum btree_id btree_id,
- struct bpos start, struct bpos end, int mode)
+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;
- bch_print_btree_node(c, b, buf, sizeof(buf));
+ bch2_btree_node_to_text(&PBUF(buf), c, b);
puts(buf);
}
- bch_btree_iter_unlock(&iter);
+ 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_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];
+
+ 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);
+ fputs(buf, stdout);
+
+ for_each_btree_node_key_unpack(b, k, &node_iter, &unpacked) {
+ bch2_bkey_val_to_text(&PBUF(buf), c, k);
+ putchar('\t');
+ puts(buf);
+ }
+ }
+ bch2_trans_exit(&trans);
}
-struct bpos parse_pos(char *buf)
+static struct bpos parse_pos(char *buf)
{
- char *s = buf;
- char *inode = strsep(&s, ":");
- char *offset = strsep(&s, ":");
- struct bpos ret = { 0 };
-
- if (!inode || !offset || s ||
- kstrtoull(inode, 10, &ret.inode) ||
- kstrtoull(offset, 10, &ret.offset))
+ char *s = buf, *field;
+ u64 inode_v = 0, offset_v = 0;
+
+ if (!(field = strsep(&s, ":")) ||
+ kstrtoull(field, 10, &inode_v))
+ die("invalid bpos %s", buf);
+
+ if ((field = strsep(&s, ":")) &&
+ kstrtoull(field, 10, &offset_v))
+ die("invalid bpos %s", buf);
+
+ if (s)
die("invalid bpos %s", buf);
- return ret;
+ return (struct bpos) { .inode = inode_v, .offset = offset_v };
}
static void list_keys_usage(void)
{
- puts("bcache list_keys - list filesystem metadata to stdout\n"
- "Usage: bcache list_keys [OPTION]... <devices>\n"
+ puts("bcachefs list - list filesystem metadata to stdout\n"
+ "Usage: bcachefs list [OPTION]... <devices>\n"
"\n"
"Options:\n"
- " -b btree_id Integer btree id to list\n"
- " -s start Start pos (as inode:offset)\n"
- " -e end End pos\n"
- " -m mode Mode for listing\n"
- " -h Display this help and exit\n"
+ " -b (extents|inodes|dirents|xattrs) Btree to list from\n"
+ " -s inode:offset Start position to list from\n"
+ " -e inode:offset End position\n"
+ " -i inode List keys for a given inode number\n"
+ " -m (keys|formats) List mode\n"
+ " -f Check (fsck) the filesystem first\n"
+ " -v Verbose mode\n"
+ " -h Display this help and exit\n"
"Report bugs to <linux-bcache@vger.kernel.org>");
}
+static const char * const list_modes[] = {
+ "keys",
+ "formats",
+ "nodes",
+ NULL
+};
+
int cmd_list(int argc, char *argv[])
{
- DECLARE_COMPLETION_ONSTACK(shutdown);
- struct cache_set_opts opts = cache_set_opts_empty();
- struct cache_set *c = NULL;
+ struct bch_opts opts = bch2_opts_empty();
enum btree_id btree_id = BTREE_ID_EXTENTS;
struct bpos start = POS_MIN, end = POS_MAX;
- const char *err;
+ u64 inum;
int mode = 0, opt;
- u64 v;
- opts.nochanges = true;
- opts.norecovery = true;
- opts.errors = BCH_ON_ERROR_CONTINUE;
- fsck_err_opt = FSCK_ERR_NO;
+ opt_set(opts, nochanges, true);
+ opt_set(opts, norecovery, true);
+ opt_set(opts, degraded, true);
+ opt_set(opts, errors, BCH_ON_ERROR_CONTINUE);
- while ((opt = getopt(argc, argv, "b:s:e:m:h")) != -1)
+ while ((opt = getopt(argc, argv, "b:s:e:i:m:fvh")) != -1)
switch (opt) {
case 'b':
- if (kstrtoull(optarg, 10, &v) ||
- v >= BTREE_ID_NR)
- die("invalid btree id");
- btree_id = v;
+ btree_id = read_string_list_or_die(optarg,
+ bch2_btree_ids, "btree id");
break;
case 's':
start = parse_pos(optarg);
case 'e':
end = parse_pos(optarg);
break;
+ case 'i':
+ if (kstrtoull(optarg, 10, &inum))
+ die("invalid inode %s", optarg);
+ start = POS(inum, 0);
+ end = POS(inum + 1, 0);
+ break;
case 'm':
+ mode = read_string_list_or_die(optarg,
+ list_modes, "list mode");
+ break;
+ case 'f':
+ opt_set(opts, fix_errors, FSCK_OPT_YES);
+ opt_set(opts, norecovery, false);
+ break;
+ case 'v':
+ opt_set(opts, verbose, true);
break;
case 'h':
list_keys_usage();
exit(EXIT_SUCCESS);
}
+ args_shift(optind);
- if (optind >= argc)
- die("Please supply device(s) to check");
+ if (!argc)
+ die("Please supply device(s)");
- err = bch_register_cache_set(argv + optind, argc - optind, opts, &c);
- if (err)
- die("error opening %s: %s", argv[optind], err);
+ 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)));
switch (mode) {
case 0:
- list_keys(c, btree_id, start, end, mode);
+ list_keys(c, btree_id, start, end);
break;
case 1:
- list_btree_formats(c, btree_id, start, end, mode);
+ list_btree_formats(c, btree_id, start, end);
+ break;
+ case 2:
+ list_nodes_keys(c, btree_id, start, end);
break;
default:
die("Invalid mode");
}
- c->stop_completion = &shutdown;
- bch_cache_set_stop(c);
- closure_put(&c->cl);
- wait_for_completion(&shutdown);
+ bch2_fs_stop(c);
return 0;
}
projects / bcachefs-tools-debian / blobdiff