#include "qcow2.h"
#include "tools-util.h"
-#include "bcachefs.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/alloc.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)
{
bucket_bytes(ca));
}
- /* Prios/gens: */
- for (i = 0; i < prio_buckets(ca); i++)
- range_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;
bool force = false;
int fd, opt;
- opts.nochanges = true;
- opts.noreplay = true;
- opts.errors = BCH_ON_ERROR_CONTINUE;
+ opt_set(opts, nochanges, true);
+ opt_set(opts, noreplay, true);
+ opt_set(opts, degraded, true);
+ opt_set(opts, errors, BCH_ON_ERROR_CONTINUE);
while ((opt = getopt(argc, argv, "o:fh")) != -1)
switch (opt) {
BUG_ON(!nr_devices);
for_each_online_member(ca, c, i) {
- int mode = O_WRONLY|O_CREAT|O_TRUNC;
+ int flags = O_WRONLY|O_CREAT|O_TRUNC;
if (!force)
- mode |= O_EXCL;
+ flags |= O_EXCL;
if (!c->devs[i])
continue;
char *path = nr_devices > 1
? mprintf("%s.%u", out, i)
: strdup(out);
- fd = xopen(path, mode, 0600);
+ fd = xopen(path, flags, 0600);
free(path);
dump_one_device(c, ca, fd);
}
static void list_keys(struct bch_fs *c, enum btree_id btree_id,
- struct bpos start, struct bpos end, int mode)
+ struct bpos start, struct bpos end)
{
struct btree_iter iter;
struct bkey_s_c k;
char buf[512];
- for_each_btree_key(&iter, c, btree_id, start, k) {
+ for_each_btree_key(&iter, c, btree_id, start,
+ BTREE_ITER_PREFETCH, k) {
if (bkey_cmp(k.k->p, end) > 0)
break;
}
static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id,
- struct bpos start, struct bpos end, int mode)
+ struct bpos start, struct bpos end)
{
struct btree_iter iter;
struct btree *b;
bch2_btree_iter_unlock(&iter);
}
+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_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) {
+ if (bkey_cmp(b->key.k.p, end) > 0)
+ break;
+
+ bch2_print_btree_node(c, b, buf, sizeof(buf));
+ fputs(buf, stdout);
+
+ buf[0] = '\t';
+
+ for_each_btree_node_key_unpack(b, k, &node_iter,
+ btree_node_is_extents(b),
+ &unpacked) {
+ bch2_bkey_val_to_text(c, bkey_type(0, btree_id),
+ buf + 1, sizeof(buf) - 1, k);
+ puts(buf);
+ }
+ }
+ bch2_btree_iter_unlock(&iter);
+}
+
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);
- return ret;
+ if (s)
+ die("invalid bpos %s", buf);
+
+ return (struct bpos) { .inode = inode_v, .offset = offset_v };
}
static void list_keys_usage(void)
" -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"
" -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
};
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;
- opts.nochanges = true;
- opts.norecovery = true;
- opts.errors = BCH_ON_ERROR_CONTINUE;
+ 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':
btree_id = read_string_list_or_die(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_recovery, true);
+ break;
case 'h':
list_keys_usage();
exit(EXIT_SUCCESS);
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");
projects / bcachefs-tools-debian / blobdiff