alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

bpos_parse() now handles symbol constants

Browse Source 
We can now parse U32_MAX/U64_MAX, as printed by bch2_bpos_to_text().

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2023-08-01 16:57:00 -04:00
parent 71ed9f183b
commit 3e39c57c70
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools-util.c
View File

@ -605,6 +605,35 @@ int dev_mounted(char *dev)
return 2; return 2;
} }
static int kstrtoull_symbolic(const char *s, unsigned int base, unsigned long long *res)
{
if (!strcmp(s, "U64_MAX")) {
*res = U64_MAX;
return 0;
}
if (!strcmp(s, "U32_MAX")) {
*res = U32_MAX;
return 0;
}
return kstrtoull(s, base, res);
}
static int kstrtouint_symbolic(const char *s, unsigned int base, unsigned *res)
{
unsigned long long tmp;
int rv;
rv = kstrtoull_symbolic(s, base, &tmp);
if (rv < 0)
return rv;
if (tmp != (unsigned long long)(unsigned int)tmp)
return -ERANGE;
*res = tmp;
return 0;
}
struct bpos bpos_parse(char *buf) struct bpos bpos_parse(char *buf)
{ {
char *orig = strdup(buf); char *orig = strdup(buf);
@ -620,14 +649,14 @@ struct bpos bpos_parse(char *buf)
u64 inode_v = 0, offset_v = 0; u64 inode_v = 0, offset_v = 0;
u32 snapshot_v = 0; u32 snapshot_v = 0;
if (kstrtoull(inode_s, 10, &inode_v)) if (kstrtoull_symbolic(inode_s, 10, &inode_v))
die("invalid bpos.inode %s", inode_s); die("invalid bpos.inode %s", inode_s);
if (kstrtoull(offset_s, 10, &offset_v)) if (kstrtoull_symbolic(offset_s, 10, &offset_v))
die("invalid bpos.offset %s", offset_s); die("invalid bpos.offset %s", offset_s);
if (snapshot_s && if (snapshot_s &&
kstrtouint(snapshot_s, 10, &snapshot_v)) kstrtouint_symbolic(snapshot_s, 10, &snapshot_v))
die("invalid bpos.snapshot %s", snapshot_s); die("invalid bpos.snapshot %s", snapshot_s);
return (struct bpos) { .inode = inode_v, .offset = offset_v, .snapshot = snapshot_v }; return (struct bpos) { .inode = inode_v, .offset = offset_v, .snapshot = snapshot_v };