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

Fix bch2_super_write() alignment

Browse Source 
We're about to switch to O_DIRECT only, which means we need to write
with proper alignment.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2024-01-10 22:26:49 -05:00
parent 9a9af6e9e6
commit 2007d9b6ce
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libbcachefs.c
View File

@ -342,6 +342,7 @@ struct bch_sb *bch2_format(struct bch_opt_strs fs_opt_strs,
void bch2_super_write(int fd, struct bch_sb *sb) void bch2_super_write(int fd, struct bch_sb *sb)
{ {
struct nonce nonce = { 0 }; struct nonce nonce = { 0 };
unsigned bs = get_blocksize(fd);
unsigned i; unsigned i;
for (i = 0; i < sb->layout.nr_superblocks; i++) { for (i = 0; i < sb->layout.nr_superblocks; i++) {
@ -349,13 +350,22 @@ void bch2_super_write(int fd, struct bch_sb *sb)
if (sb->offset == BCH_SB_SECTOR) { if (sb->offset == BCH_SB_SECTOR) {
/* Write backup layout */ /* Write backup layout */
xpwrite(fd, &sb->layout, sizeof(sb->layout),
BCH_SB_LAYOUT_SECTOR << 9, BUG_ON(bs > 4096);
char *buf = aligned_alloc(bs, bs);
xpread(fd, buf, bs, 4096 - bs);
memcpy(buf + bs - sizeof(sb->layout),
&sb->layout,
sizeof(sb->layout));
xpwrite(fd, buf, bs, 4096 - bs,
"backup layout"); "backup layout");
free(buf);
} }
sb->csum = csum_vstruct(NULL, BCH_SB_CSUM_TYPE(sb), nonce, sb); sb->csum = csum_vstruct(NULL, BCH_SB_CSUM_TYPE(sb), nonce, sb);
xpwrite(fd, sb, vstruct_bytes(sb), xpwrite(fd, sb, round_up(vstruct_bytes(sb), bs),
le64_to_cpu(sb->offset) << 9, le64_to_cpu(sb->offset) << 9,
"superblock"); "superblock");
} }