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

Fix build error with libblkid usage

Browse Source
This commit is contained in:
Mike Krinkin 2015-08-23 21:38:56 +03:00 committed by Kent Overstreet
parent f45d84c6ab
commit e9acf2e0d2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bcacheadm-query.c
View File

@ -303,7 +303,7 @@ int cmd_status(NihCommand *command, char *const *args)
buf[len] = '\0'; buf[len] = '\0';
dev_names[dev_count] = dev_name(buf); dev_names[dev_count] = dev_name(buf);
snprintf(dev_path, MAX_PATH, "%s/%s", "/dev", snprintf(dev_path, sizeof(dev_path), "%s/%s", "/dev",
dev_names[dev_count]); dev_names[dev_count]);
sb = query_dev(dev_path, false, false, sb = query_dev(dev_path, false, false,
true, dev_uuid); true, dev_uuid);
@ -331,7 +331,7 @@ int cmd_status(NihCommand *command, char *const *args)
int j; int j;
uuid_unparse(m->uuid.b, uuid_str); uuid_unparse(m->uuid.b, uuid_str);
snprintf(dev_state, MAX_PATH, "%s", snprintf(dev_state, sizeof(dev_state), "%s",
cache_state[CACHE_STATE(m)]); cache_state[CACHE_STATE(m)]);
for (j = 0; j < dev_count; j++) { for (j = 0; j < dev_count; j++) {
@ -339,7 +339,7 @@ int cmd_status(NihCommand *command, char *const *args)
break; break;
} else if (j == dev_count - 1) { } else if (j == dev_count - 1) {
if (!strcmp(cache_state[CACHE_STATE(m)], "active")) if (!strcmp(cache_state[CACHE_STATE(m)], "active"))
snprintf(dev_state, MAX_PATH, "%s", "missing"); snprintf(dev_state, sizeof(dev_state), "%s", "missing");
break; break;
} }
} }

2
probe-bcache.c
View File

@ -8,7 +8,7 @@
#define __USE_FILE_OFFSET64 #define __USE_FILE_OFFSET64
#define _XOPEN_SOURCE 500 #define _XOPEN_SOURCE 500
#include <blkid.h> #include <blkid/blkid.h>
#include <fcntl.h> #include <fcntl.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <stdbool.h> #include <stdbool.h>