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

Update data offset format and warn about the previous one.

Browse Source 
Also update the macro to select a bdev.
Also reindent.
This commit is contained in:
Gabriel 2013-03-09 14:58:57 +01:00 committed by Kent Overstreet
parent 849ce47338
commit 94755cc757
3 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
bcache-super-show.c
View File

@ -60,13 +60,13 @@ int main(int argc, char **argv)
exit(2); exit(2);
} }
if (pread(fd, &sb, sizeof(sb), 4096) != sizeof(sb)) { if (pread(fd, &sb, sizeof(sb), SB_START) != sizeof(sb)) {
fprintf(stderr, "Couldn't read\n"); fprintf(stderr, "Couldn't read\n");
exit(2); exit(2);
} }
printf("sb.magic\t\t"); printf("sb.magic\t\t");
if (! memcmp(sb.magic, bcache_magic, 16)) { if (!memcmp(sb.magic, bcache_magic, 16)) {
printf("ok\n"); printf("ok\n");
} else { } else {
printf("bad magic\n"); printf("bad magic\n");
@ -89,7 +89,7 @@ int main(int argc, char **argv)
printf(" [match]\n"); printf(" [match]\n");
} else { } else {
printf(" [expected %" PRIX64 "]\n", expected_csum); printf(" [expected %" PRIX64 "]\n", expected_csum);
if (! force_csum) { if (!force_csum) {
fprintf(stderr, "Corrupt superblock (bad csum)\n"); fprintf(stderr, "Corrupt superblock (bad csum)\n");
exit(2); exit(2);
} }
@ -97,16 +97,22 @@ int main(int argc, char **argv)
printf("sb.version\t\t%" PRIu64, sb.version); printf("sb.version\t\t%" PRIu64, sb.version);
switch (sb.version) { switch (sb.version) {
case 0: case BCACHE_SB_VERSION_CDEV:
printf(" [cache device]\n"); printf(" [cache device]\n");
break; break;
// SB_BDEV macro says bdev iff version is odd; only 0 and 1 case BCACHE_SB_VERSION_CDEV_WITH_UUID:
// seem to be fully implemented however. printf(" [cache device (new UUID format)]\n");
case CACHE_BACKING_DEV: // 1 break;
case BCACHE_SB_VERSION_BDEV:
printf(" [backing device]\n"); printf(" [backing device]\n");
break; break;
case BCACHE_SB_VERSION_BDEV_WITH_OFFSET:
printf(" [backing device with data offset]\n");
break;
default: default:
printf(" [unknown]\n"); printf(" [unknown]\n");
// exit code? // exit code?
@ -118,30 +124,36 @@ int main(int argc, char **argv)
uuid_unparse(sb.uuid, uuid); uuid_unparse(sb.uuid, uuid);
printf("dev.uuid\t\t%s\n", uuid); printf("dev.uuid\t\t%s\n", uuid);
printf( printf("dev.sectors_per_block\t%u\n"
"dev.sectors_per_block\t%u\n" "dev.sectors_per_bucket\t%u\n"
"dev.sectors_per_bucket\t%u\n" "dev.bucket_count\t%ju\n"
"dev.bucket_count\t%ju\n" "dev.cache_count\t\t%u\n", // expect SB_IS_BDEV(&sb) ? 0 : 1
"dev.cache_count\t\t%u\n", // expect version == 0 ? 1 : 0 sb.block_size,
sb.block_size, sb.bucket_size,
sb.bucket_size, sb.nbuckets,
sb.nbuckets, sb.nr_this_dev);
sb.nr_this_dev);
if (sb.version == 0) { if (!SB_IS_BDEV(&sb)) {
printf( printf("dev.cache.first_bucket\t%u\n"
"dev.cache.first_bucket\t%u\n" "dev.cache.first_sector\t%u\n"
"dev.cache.first_sector\t%u\n" "dev.cache.discard\t%s\n",
"dev.cache.discard\t%s\n", sb.first_bucket,
sb.first_bucket, sb.bucket_size * sb.first_bucket,
sb.bucket_size * sb.first_bucket, CACHE_DISCARD(&sb) ? "yes" : "no");
CACHE_DISCARD(&sb) ? "yes" : "no"); } else if (sb.version == BCACHE_SB_VERSION_BDEV) {
} else if (sb.version == CACHE_BACKING_DEV) { printf("dev.data.first_sector\t%u\n"
printf( "dev.data.writeback\t%s\n",
"dev.data.first_sector\t%u\n" BDEV_DATA_START_DEFAULT,
"dev.data.writeback\t%s\n", BDEV_WRITEBACK(&sb) ? "yes" : "no");
BDEV_DATA_START, } else if (sb.version == BCACHE_SB_VERSION_BDEV_WITH_OFFSET) {
BDEV_WRITEBACK(&sb) ? "yes" : "no"); if (sb.keys == 1 || sb.d[0]) {
fprintf(stderr, "Possible experimental format detected, bailing\n");
exit(3);
}
printf("dev.data.first_sector\t%lu\n"
"dev.data.writeback\t%s\n",
sb.data_offset,
BDEV_WRITEBACK(&sb) ? "yes" : "no");
} }
putchar('\n'); putchar('\n');

7
bcache.h
View File

@ -32,6 +32,7 @@ static const char bcache_magic[] = {
#define SB_LABEL_SIZE 32 #define SB_LABEL_SIZE 32
#define SB_JOURNAL_BUCKETS 256U #define SB_JOURNAL_BUCKETS 256U
#define BDEV_DATA_START_DEFAULT 16 /* sectors */ #define BDEV_DATA_START_DEFAULT 16 /* sectors */
#define SB_START (SB_SECTOR * 512)
struct cache_sb { struct cache_sb {
uint64_t csum; uint64_t csum;
@ -84,7 +85,11 @@ struct cache_sb {
uint64_t d[SB_JOURNAL_BUCKETS]; /* journal buckets */ uint64_t d[SB_JOURNAL_BUCKETS]; /* journal buckets */
}; };
BITMASK(SB_BDEV, struct cache_sb, version, 0, 1); static inline bool SB_IS_BDEV(const struct cache_sb *sb)
{
return sb->version == BCACHE_SB_VERSION_BDEV
|| sb->version == BCACHE_SB_VERSION_BDEV_WITH_OFFSET;
}
BITMASK(BDEV_WRITEBACK, struct cache_sb, flags, 0, 1); BITMASK(BDEV_WRITEBACK, struct cache_sb, flags, 0, 1);

2
make-bcache.c
View File

@ -185,7 +185,7 @@ static void write_sb(char *dev, unsigned block_size, unsigned bucket_size,
uuid_unparse(sb.uuid, uuid_str); uuid_unparse(sb.uuid, uuid_str);
uuid_unparse(sb.set_uuid, set_uuid_str); uuid_unparse(sb.set_uuid, set_uuid_str);
if (SB_BDEV(&sb)) { if (SB_IS_BDEV(&sb)) {
SET_BDEV_WRITEBACK(&sb, writeback); SET_BDEV_WRITEBACK(&sb, writeback);
if (data_offset != BDEV_DATA_START_DEFAULT) { if (data_offset != BDEV_DATA_START_DEFAULT) {