return 0;
}
+static void device_add_usage(void)
+{
+ puts("bcache device_add - add a device to an existing filesystem\n"
+ "Usage: bcache device_add [OPTION]... filesystem device\n"
+ "\n"
+ "Options:\n"
+ " --fs_size=size Size of filesystem on device\n"
+ " --bucket=size Bucket size\n"
+ " --discard Enable discards\n"
+ " -t, --tier=# Higher tier (e.g. 1) indicates slower devices\n"
+ " -f, --force Use device even if it appears to already be formatted\n"
+ " -h, --help Display this help and exit\n"
+ "\n"
+ "Report bugs to <linux-bcache@vger.kernel.org>");
+}
+
+static const struct option device_add_opts[] = {
+ { "fs_size", required_argument, NULL, 'S' },
+ { "bucket", required_argument, NULL, 'B' },
+ { "discard", no_argument, NULL, 'D' },
+ { "tier", required_argument, NULL, 't' },
+ { "force", no_argument, NULL, 'f' },
+ { NULL }
+};
+
int cmd_device_add(int argc, char *argv[])
{
- if (argc < 3)
- die("Please supply a filesystem and at least one device to add");
+ struct format_opts format_opts = format_opts_default();
+ struct dev_opts dev_opts = { 0 };
+ bool force = false;
+ int opt;
- struct bcache_handle fs = bcache_fs_open(argv[1]);
+ while ((opt = getopt_long(argc, argv, "t:fh",
+ device_add_opts, NULL)) != -1)
+ switch (opt) {
+ case 'S':
+ if (bch_strtoull_h(optarg, &dev_opts.size))
+ die("invalid filesystem size");
- for (unsigned i = 2; i < argc; i++) {
- struct bch_ioctl_disk_add ia = {
- .dev = (__u64) argv[i],
- };
+ dev_opts.size >>= 9;
+ break;
+ case 'B':
+ dev_opts.bucket_size =
+ hatoi_validate(optarg, "bucket size");
+ break;
+ case 'D':
+ dev_opts.discard = true;
+ break;
+ case 't':
+ if (kstrtouint(optarg, 10, &dev_opts.tier) ||
+ dev_opts.tier >= BCH_TIER_MAX)
+ die("invalid tier");
+ break;
+ case 'f':
+ force = true;
+ break;
+ case 'h':
+ device_add_usage();
+ exit(EXIT_SUCCESS);
+ }
- xioctl(fs.ioctl_fd, BCH_IOCTL_DISK_ADD, &ia);
- }
+ if (argc - optind != 2)
+ die("Please supply a filesystem and a device to add");
+
+ struct bcache_handle fs = bcache_fs_open(argv[optind]);
+
+ dev_opts.path = argv[optind + 1];
+ dev_opts.fd = open_for_format(dev_opts.path, force);
+
+ format_opts.block_size =
+ read_file_u64(fs.sysfs_fd, "block_size_bytes") >> 9;
+ format_opts.btree_node_size =
+ read_file_u64(fs.sysfs_fd, "btree_node_size_bytes") >> 9;
+
+ struct bch_sb *sb = bcache_format(format_opts, &dev_opts, 1);
+ free(sb);
+ fsync(dev_opts.fd);
+ close(dev_opts.fd);
+
+ struct bch_ioctl_disk_add ia = {
+ .dev = (__u64) dev_opts.path,
+ };
+
+ xioctl(fs.ioctl_fd, BCH_IOCTL_DISK_ADD, &ia);
return 0;
}
#include <sys/types.h>
#include <unistd.h>
-#include <blkid.h>
#include <uuid/uuid.h>
#include "ccan/darray/darray.h"
#include "opts.h"
#include "util.h"
-/* Open a block device, do magic blkid stuff: */
-static int open_for_format(const char *dev, bool force)
-{
- blkid_probe pr;
- const char *fs_type = NULL, *fs_label = NULL;
- size_t fs_type_len, fs_label_len;
-
- int fd = xopen(dev, O_RDWR|O_EXCL);
-
- if (force)
- return fd;
-
- if (!(pr = blkid_new_probe()))
- die("blkid error 1");
- if (blkid_probe_set_device(pr, fd, 0, 0))
- die("blkid error 2");
- if (blkid_probe_enable_partitions(pr, true))
- die("blkid error 3");
- if (blkid_do_fullprobe(pr) < 0)
- die("blkid error 4");
-
- blkid_probe_lookup_value(pr, "TYPE", &fs_type, &fs_type_len);
- blkid_probe_lookup_value(pr, "LABEL", &fs_label, &fs_label_len);
-
- if (fs_type) {
- if (fs_label)
- printf("%s contains a %s filesystem labelled '%s'\n",
- dev, fs_type, fs_label);
- else
- printf("%s contains a %s filesystem\n",
- dev, fs_type);
- fputs("Proceed anyway?", stdout);
- if (!ask_yn())
- exit(EXIT_FAILURE);
- }
-
- blkid_free_probe(pr);
- return fd;
-}
-
#define OPTS \
t("bcache format - create a new bcache filesystem on one or more devices") \
t("Usage: bcache format [OPTION]... <devices>") \
"\n"
"Device specific options:\n"
" --fs_size=size Size of filesystem on device\n"
- " --bucket=size bucket size\n"
+ " --bucket=size Bucket size\n"
" --discard Enable discards\n"
- " -t, --tier=# tier of subsequent devices\n"
+ " -t, --tier=# Higher tier (e.g. 1) indicates slower devices\n"
"\n"
- " -h, --help display this help and exit\n"
+ " -h, --help Display this help and exit\n"
"\n"
"Device specific options must come before corresponding devices, e.g.\n"
" bcache format --tier 0 /dev/sdb --tier 1 /dev/sdc\n"
{ NULL }
};
-static unsigned hatoi_validate(const char *s, const char *msg)
-{
- u64 v;
-
- if (bch_strtoull_h(s, &v))
- die("bad %s %s", msg, s);
-
- if (v & (v - 1))
- die("%s must be a power of two", msg);
-
- v /= 512;
-
- if (v > USHRT_MAX)
- die("%s too large\n", msg);
-
- if (!v)
- die("%s too small\n", msg);
-
- return v;
-}
-
int cmd_format(int argc, char *argv[])
{
darray(struct dev_opts) devices;
die("cannot format %s, too small (%llu sectors, min %llu)",
i->path, i->size, min_size(opts.block_size));
+ /* Bucket size must be >= block size: */
+ i->bucket_size = opts.block_size;
+
+ /* Bucket size must be >= btree node size: */
+ i->bucket_size = max(i->bucket_size, opts.btree_node_size);
+
/* Want a bucket size of at least 128k, if possible: */
- i->bucket_size = max(opts.block_size, 256U);
+ i->bucket_size = max(i->bucket_size, 256U);
if (i->size >= min_size(i->bucket_size)) {
unsigned scale = max(1,
if (i->bucket_size < opts.block_size)
die("Bucket size cannot be smaller than block size");
+ if (i->bucket_size < opts.btree_node_size)
+ die("Bucket size cannot be smaller than btree node size");
+
if (i->nbuckets < BCH_MIN_NR_NBUCKETS)
die("Not enough buckets: %llu, need %u (bucket size %u)",
i->nbuckets, BCH_MIN_NR_NBUCKETS, i->bucket_size);
#include <sys/types.h>
#include <unistd.h>
+#include <blkid.h>
#include <uuid/uuid.h>
#include "ccan/crc/crc.h"
char *read_file_str(int dirfd, const char *path)
{
int fd = xopenat(dirfd, path, O_RDONLY);
- size_t len = xfstat(fd).st_size;
+ ssize_t len = xfstat(fd).st_size;
- char *buf = malloc(len + 1);
+ char *buf = xmalloc(len + 1);
- xpread(fd, buf, len, 0);
+ len = read(fd, buf, len);
+ if (len < 0)
+ die("read error: %s", strerror(errno));
buf[len] = '\0';
if (len && buf[len - 1] == '\n')
u64 read_file_u64(int dirfd, const char *path)
{
char *buf = read_file_str(dirfd, path);
- u64 ret = strtoll(buf, NULL, 10);
-
+ u64 v;
+ if (kstrtou64(buf, 10, &v))
+ die("read_file_u64: error parsing %s (got %s)", path, buf);
free(buf);
- return ret;
+ return v;
}
/* String list options: */
return ret >> 9;
}
+/* Open a block device, do magic blkid stuff to probe for existing filesystems: */
+int open_for_format(const char *dev, bool force)
+{
+ blkid_probe pr;
+ const char *fs_type = NULL, *fs_label = NULL;
+ size_t fs_type_len, fs_label_len;
+
+ int fd = xopen(dev, O_RDWR|O_EXCL);
+
+ if (force)
+ return fd;
+
+ if (!(pr = blkid_new_probe()))
+ die("blkid error 1");
+ if (blkid_probe_set_device(pr, fd, 0, 0))
+ die("blkid error 2");
+ if (blkid_probe_enable_partitions(pr, true))
+ die("blkid error 3");
+ if (blkid_do_fullprobe(pr) < 0)
+ die("blkid error 4");
+
+ blkid_probe_lookup_value(pr, "TYPE", &fs_type, &fs_type_len);
+ blkid_probe_lookup_value(pr, "LABEL", &fs_label, &fs_label_len);
+
+ if (fs_type) {
+ if (fs_label)
+ printf("%s contains a %s filesystem labelled '%s'\n",
+ dev, fs_type, fs_label);
+ else
+ printf("%s contains a %s filesystem\n",
+ dev, fs_type);
+ fputs("Proceed anyway?", stdout);
+ if (!ask_yn())
+ exit(EXIT_FAILURE);
+ }
+
+ blkid_free_probe(pr);
+ return fd;
+}
+
/* Global control device: */
int bcachectl_open(void)
{
}
return *a_prefix ? NULL : a;
}
+
+unsigned hatoi_validate(const char *s, const char *msg)
+{
+ u64 v;
+
+ if (bch_strtoull_h(s, &v))
+ die("bad %s %s", msg, s);
+
+ if (v & (v - 1))
+ die("%s must be a power of two", msg);
+
+ v /= 512;
+
+ if (v > USHRT_MAX)
+ die("%s too large\n", msg);
+
+ if (!v)
+ die("%s too small\n", msg);
+
+ return v;
+}
u64 get_size(const char *, int);
unsigned get_blocksize(const char *, int);
+int open_for_format(const char *, bool);
int bcachectl_open(void);
const char *strcmp_prefix(const char *, const char *);
+unsigned hatoi_validate(const char *, const char *);
+
#endif /* _TOOLS_UTIL_H */
projects / bcachefs-tools-debian / commitdiff