X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=tools-util.c;h=591e2a0c45b8cb92e21f55a0b12848932523e4a1;hb=6f5afc0c12bbf56ffdabe5b2c5297aef255c4baa;hp=88e923cb22e3b242970ee6e4dd123fb8dc38230f;hpb=a9a46467e618c5f040107cd87ebe7afa7863bc3c;p=bcachefs-tools-debian

diff --git a/tools-util.c b/tools-util.c
index 88e923c..591e2a0 100644
--- a/tools-util.c
+++ b/tools-util.c
@@ -94,12 +94,12 @@ void xpread(int fd, void *buf, size_t count, off_t offset)
 	}
 }
 
-void xpwrite(int fd, const void *buf, size_t count, off_t offset)
+void xpwrite(int fd, const void *buf, size_t count, off_t offset, const char *msg)
 {
 	ssize_t r = pwrite(fd, buf, count, offset);
 
 	if (r != count)
-		die("write error (ret %zi err %m)", r);
+		die("error writing %s (ret %zi err %m)", msg, r);
 }
 
 struct stat xfstatat(int dirfd, const char *path, int flags)
@@ -143,42 +143,6 @@ int printf_pad(unsigned pad, const char * fmt, ...)
        return ret;
 }
 
-struct units_buf __pr_units(s64 _v, enum units units)
-{
-	struct units_buf ret;
-	char *out = ret.b, *end = out + sizeof(ret.b);
-	u64 v = _v;
-
-	if (_v < 0) {
-		out += scnprintf(out, end - out, "-");
-		v = -_v;
-	}
-
-	switch (units) {
-	case BYTES:
-		snprintf(out, end - out, "%llu", v << 9);
-		break;
-	case SECTORS:
-		snprintf(out, end - out, "%llu", v);
-		break;
-	case HUMAN_READABLE:
-		v <<= 9;
-
-		if (v >= 1024) {
-			int exp = log(v) / log(1024);
-			snprintf(out, end - out, "%.1f%c",
-				 v / pow(1024, exp),
-				 "KMGTPE"[exp-1]);
-		} else {
-			snprintf(out, end - out, "%llu", v);
-		}
-
-		break;
-	}
-
-	return ret;
-}
-
 /* Argument parsing stuff: */
 
 /* File parsing (i.e. sysfs) */
@@ -211,7 +175,7 @@ u64 read_file_u64(int dirfd, const char *path)
 {
 	char *buf = read_file_str(dirfd, path);
 	u64 v;
-	if (kstrtou64(buf, 10, &v))
+	if (bch2_strtou64_h(buf, &v))
 		die("read_file_u64: error parsing %s (got %s)", path, buf);
 	free(buf);
 	return v;
@@ -242,17 +206,17 @@ u64 get_size(const char *path, int fd)
 	return ret;
 }
 
-/* Returns blocksize in units of 512 byte sectors: */
+/* Returns blocksize, in bytes: */
 unsigned get_blocksize(const char *path, int fd)
 {
 	struct stat statbuf = xfstat(fd);
 
 	if (!S_ISBLK(statbuf.st_mode))
-		return statbuf.st_blksize >> 9;
+		return statbuf.st_blksize;
 
 	unsigned ret;
 	xioctl(fd, BLKPBSZGET, &ret);
-	return ret >> 9;
+	return ret;
 }
 
 /* Open a block device, do magic blkid stuff to probe for existing filesystems: */
@@ -262,7 +226,9 @@ int open_for_format(const char *dev, bool force)
 	const char *fs_type = NULL, *fs_label = NULL;
 	size_t fs_type_len, fs_label_len;
 
-	int fd = xopen(dev, O_RDWR|O_EXCL);
+	int fd = open(dev, O_RDWR|O_EXCL);
+	if (fd < 0)
+		die("Error opening device to format %s: %m", dev);
 
 	if (force)
 		return fd;
@@ -289,6 +255,8 @@ int open_for_format(const char *dev, bool force)
 		fputs("Proceed anyway?", stdout);
 		if (!ask_yn())
 			exit(EXIT_FAILURE);
+		while (blkid_do_probe(pr) == 0)
+    			blkid_do_wipe(pr, 0);
 	}
 
 	blkid_free_probe(pr);
@@ -327,22 +295,21 @@ static int range_cmp(const void *_l, const void *_r)
 void ranges_sort_merge(ranges *r)
 {
 	struct range *t, *i;
-	ranges tmp = { NULL };
+	ranges tmp = { 0 };
 
-	sort(&darray_item(*r, 0), darray_size(*r),
-	     sizeof(darray_item(*r, 0)), range_cmp, NULL);
+	sort(r->data, r->nr, sizeof(r->data[0]), range_cmp, NULL);
 
 	/* Merge contiguous ranges: */
-	darray_foreach(i, *r) {
-		t = tmp.size ?  &tmp.item[tmp.size - 1] : NULL;
+	darray_for_each(*r, i) {
+		t = tmp.nr ?  &tmp.data[tmp.nr - 1] : NULL;
 
 		if (t && t->end >= i->start)
 			t->end = max(t->end, i->end);
 		else
-			darray_append(tmp, *i);
+			darray_push(&tmp, *i);
 	}
 
-	darray_free(*r);
+	darray_exit(r);
 	*r = tmp;
 }
 
@@ -350,7 +317,7 @@ void ranges_roundup(ranges *r, unsigned block_size)
 {
 	struct range *i;
 
-	darray_foreach(i, *r) {
+	darray_for_each(*r, i) {
 		i->start = round_down(i->start, block_size);
 		i->end	= round_up(i->end, block_size);
 	}
@@ -360,7 +327,7 @@ void ranges_rounddown(ranges *r, unsigned block_size)
 {
 	struct range *i;
 
-	darray_foreach(i, *r) {
+	darray_for_each(*r, i) {
 		i->start = round_up(i->start, block_size);
 		i->end	= round_down(i->end, block_size);
 		i->end	= max(i->end, i->start);
@@ -399,24 +366,6 @@ char *strcmp_prefix(char *a, const char *a_prefix)
 	return *a_prefix ? NULL : a;
 }
 
-unsigned hatoi_validate(const char *s, const char *msg)
-{
-	u64 v;
-
-	if (bch2_strtoull_h(s, &v))
-		die("bad %s %s", msg, s);
-
-	v /= 512;
-
-	if (v > USHRT_MAX)
-		die("%s too large\n", msg);
-
-	if (!v)
-		die("%s too small\n", msg);
-
-	return v;
-}
-
 /* crc32c */
 
 static u32 crc32c_default(u32 crc, const void *buf, size_t size)
@@ -663,3 +612,22 @@ int dev_mounted(char *dev)
 		return 1;
 	return 2;
 }
+
+struct bpos bpos_parse(char *buf)
+{
+	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 (struct bpos) { .inode = inode_v, .offset = offset_v };
+}