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

bcacheadm: fix tiering and backing device bugs

Browse Source 
TODO: Support multiple devices for a single -C or -B flag

Change-Id: I73b18a39a0e0ff564600c2fc7386a785d3a10870
Signed-off-by: Jacob Malevich <jam@daterainc.com>
This commit is contained in:
Jacob Malevich 2014-11-12 17:51:42 -08:00
parent 552dc9fa7d
commit 34f54790d5
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bcache.c
View File

@ -637,7 +637,7 @@ void write_cache_sbs(int *fds, struct cache_sb *sb,
void next_cache_device(struct cache_sb *sb, void next_cache_device(struct cache_sb *sb,
unsigned replication_set, unsigned replication_set,
unsigned tier, int tier,
unsigned replacement_policy, unsigned replacement_policy,
bool discard) bool discard)
{ {

2
bcache.h
View File

@ -50,7 +50,7 @@ void write_backingdev_sb(int, unsigned, unsigned *, bool, uint64_t,
const char *, uuid_le); const char *, uuid_le);
int dev_open(const char *, bool); int dev_open(const char *, bool);
void write_cache_sbs(int *, struct cache_sb *, unsigned, unsigned *, int); void write_cache_sbs(int *, struct cache_sb *, unsigned, unsigned *, int);
void next_cache_device(struct cache_sb *, unsigned, unsigned, unsigned, bool); void next_cache_device(struct cache_sb *, unsigned, int, unsigned, bool);
unsigned get_blocksize(const char *); unsigned get_blocksize(const char *);
long strtoul_or_die(const char *, size_t, const char *); long strtoul_or_die(const char *, size_t, const char *);

17
bcacheadm.c
View File

@ -51,7 +51,7 @@ enum exit {
int bdev = -1; int bdev = -1;
int devs = 0; int devs = 0;
char *cache_devices[MAX_DEVS]; char *cache_devices[MAX_DEVS];
unsigned tier_mapping[MAX_DEVS]; int tier_mapping[MAX_DEVS];
char *backing_devices[MAX_DEVS]; char *backing_devices[MAX_DEVS];
char *backing_dev_labels[MAX_DEVS]; char *backing_dev_labels[MAX_DEVS];
size_t i, nr_backing_devices = 0, nr_cache_devices = 0; size_t i, nr_backing_devices = 0, nr_cache_devices = 0;
@ -74,7 +74,7 @@ const char *cache_set_uuid = 0;
const char *csum_type = 0; const char *csum_type = 0;
char *metadata_replicas = 0; char *metadata_replicas = 0;
char *data_replicas = 0; char *data_replicas = 0;
unsigned tier = 0; char *tier = 0;
/* super-show globals */ /* super-show globals */
@ -112,7 +112,10 @@ static int set_cache(NihOption *option, const char *arg)
cache_devices[nr_cache_devices] = (char *)malloc(sizeof(char *) * cache_devices[nr_cache_devices] = (char *)malloc(sizeof(char *) *
strlen(arg) + 1); strlen(arg) + 1);
strcpy(cache_devices[nr_cache_devices], arg); strcpy(cache_devices[nr_cache_devices], arg);
tier_mapping[nr_cache_devices] = tier; if(!tier)
tier_mapping[nr_cache_devices] = 0;
else
tier_mapping[nr_cache_devices] = atoi(tier);
devs++; devs++;
nr_cache_devices++; nr_cache_devices++;
@ -122,9 +125,11 @@ static int set_bdev(NihOption *option, const char *arg)
{ {
bdev = 1; bdev = 1;
backing_dev_labels[nr_backing_devices] = (char *)malloc(sizeof(char *) * if(label) {
strlen(label) + 1); backing_dev_labels[nr_backing_devices] =
(char *)malloc(sizeof(char *) * strlen(label) + 1);
strcpy(backing_dev_labels[nr_backing_devices], label); strcpy(backing_dev_labels[nr_backing_devices], label);
}
backing_devices[nr_backing_devices] = (char *)malloc(sizeof(char *) * backing_devices[nr_backing_devices] = (char *)malloc(sizeof(char *) *
strlen(arg) + 1); strlen(arg) + 1);
@ -229,7 +234,6 @@ int make_bcache (NihCommand *command, char *const *args)
int cache_dev_fd[devs]; int cache_dev_fd[devs];
int backing_dev_fd[devs]; int backing_dev_fd[devs];
printf("meta: %s, data: %s", metadata_replicas, data_replicas);
cache_set_sb = calloc(1, sizeof(*cache_set_sb) + cache_set_sb = calloc(1, sizeof(*cache_set_sb) +
sizeof(struct cache_member) * devs); sizeof(struct cache_member) * devs);
@ -276,7 +280,6 @@ int make_bcache (NihCommand *command, char *const *args)
if(!bucket_sizes[0]) bucket_sizes[0] = 1024; if(!bucket_sizes[0]) bucket_sizes[0] = 1024;
for(i = 0; i < nr_cache_devices; i++) for(i = 0; i < nr_cache_devices; i++)
next_cache_device(cache_set_sb, next_cache_device(cache_set_sb,
replication_set, replication_set,