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

Update bcachefs sources to 0a9be96b50 bcachefs: BSET_OFFSET()

Browse Source
This commit is contained in:
Kent Overstreet 2021-07-16 12:58:24 -04:00
parent 669fc107c6
commit 646aabf327
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
15178a6479955d5aeaa124c0de9dabac87ffcca0 0a9be96b5087967ac57007a131614ab6b4cadce4

3
libbcachefs/bcachefs_format.h
View File

@ -1742,6 +1742,9 @@ LE32_BITMASK(BSET_BIG_ENDIAN, struct bset, flags, 4, 5);
LE32_BITMASK(BSET_SEPARATE_WHITEOUTS, LE32_BITMASK(BSET_SEPARATE_WHITEOUTS,
struct bset, flags, 5, 6); struct bset, flags, 5, 6);
/* Sector offset within the btree node: */
LE32_BITMASK(BSET_OFFSET, struct bset, flags, 16, 32);
struct btree_node { struct btree_node {
struct bch_csum csum; struct bch_csum csum;
__le64 magic; __le64 magic;

19
libbcachefs/btree_io.c
View File

@ -656,7 +656,8 @@ void bch2_btree_node_drop_keys_outside_node(struct btree *b)
static int validate_bset(struct bch_fs *c, struct bch_dev *ca, static int validate_bset(struct bch_fs *c, struct bch_dev *ca,
struct btree *b, struct bset *i, struct btree *b, struct bset *i,
unsigned sectors, int write, bool have_retry) unsigned offset, unsigned sectors,
int write, bool have_retry)
{ {
unsigned version = le16_to_cpu(i->version); unsigned version = le16_to_cpu(i->version);
const char *err; const char *err;
@ -694,18 +695,23 @@ static int validate_bset(struct bch_fs *c, struct bch_dev *ca,
BTREE_ERR_FATAL, c, ca, b, i, BTREE_ERR_FATAL, c, ca, b, i,
"BSET_SEPARATE_WHITEOUTS no longer supported"); "BSET_SEPARATE_WHITEOUTS no longer supported");
if (btree_err_on(b->written + sectors > c->opts.btree_node_size, if (btree_err_on(offset + sectors > c->opts.btree_node_size,
BTREE_ERR_FIXABLE, c, ca, b, i, BTREE_ERR_FIXABLE, c, ca, b, i,
"bset past end of btree node")) { "bset past end of btree node")) {
i->u64s = 0; i->u64s = 0;
return 0; return 0;
} }
btree_err_on(b->written && !i->u64s, btree_err_on(offset && !i->u64s,
BTREE_ERR_FIXABLE, c, ca, b, i, BTREE_ERR_FIXABLE, c, ca, b, i,
"empty bset"); "empty bset");
if (!b->written) { btree_err_on(BSET_OFFSET(i) &&
BSET_OFFSET(i) != offset,
BTREE_ERR_WANT_RETRY, c, ca, b, i,
"bset at wrong sector offset");
if (!offset) {
struct btree_node *bn = struct btree_node *bn =
container_of(i, struct btree_node, keys); container_of(i, struct btree_node, keys);
/* These indicate that we read the wrong btree node: */ /* These indicate that we read the wrong btree node: */
@ -959,7 +965,7 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct bch_dev *ca,
b->version_ondisk = min(b->version_ondisk, b->version_ondisk = min(b->version_ondisk,
le16_to_cpu(i->version)); le16_to_cpu(i->version));
ret = validate_bset(c, ca, b, i, sectors, ret = validate_bset(c, ca, b, i, b->written, sectors,
READ, have_retry); READ, have_retry);
if (ret) if (ret)
goto fsck_err; goto fsck_err;
@ -1717,7 +1723,7 @@ static int validate_bset_for_write(struct bch_fs *c, struct btree *b,
return -1; return -1;
ret = validate_bset_keys(c, b, i, &whiteout_u64s, WRITE, false) ?: ret = validate_bset_keys(c, b, i, &whiteout_u64s, WRITE, false) ?:
validate_bset(c, NULL, b, i, sectors, WRITE, false); validate_bset(c, NULL, b, i, b->written, sectors, WRITE, false);
if (ret) { if (ret) {
bch2_inconsistent_error(c); bch2_inconsistent_error(c);
dump_stack(); dump_stack();
@ -1880,6 +1886,7 @@ do_write:
i->version = c->sb.version < bcachefs_metadata_version_new_versioning i->version = c->sb.version < bcachefs_metadata_version_new_versioning
? cpu_to_le16(BCH_BSET_VERSION_OLD) ? cpu_to_le16(BCH_BSET_VERSION_OLD)
: cpu_to_le16(c->sb.version); : cpu_to_le16(c->sb.version);
SET_BSET_OFFSET(i, b->written);
SET_BSET_CSUM_TYPE(i, bch2_meta_checksum_type(c)); SET_BSET_CSUM_TYPE(i, bch2_meta_checksum_type(c));
if (bch2_csum_type_is_encryption(BSET_CSUM_TYPE(i))) if (bch2_csum_type_is_encryption(BSET_CSUM_TYPE(i)))

4
libbcachefs/fs.c
View File

@ -1275,8 +1275,8 @@ static int bch2_statfs(struct dentry *dentry, struct kstatfs *buf)
buf->f_type = BCACHEFS_STATFS_MAGIC; buf->f_type = BCACHEFS_STATFS_MAGIC;
buf->f_bsize = sb->s_blocksize; buf->f_bsize = sb->s_blocksize;
buf->f_blocks = usage.capacity >> shift; buf->f_blocks = usage.capacity >> shift;
buf->f_bfree = avail_factor(usage.free) >> shift; buf->f_bfree = usage.free >> shift;
buf->f_bavail = buf->f_bfree; buf->f_bavail = avail_factor(usage.free) >> shift;
buf->f_files = usage.nr_inodes + avail_inodes; buf->f_files = usage.nr_inodes + avail_inodes;
buf->f_ffree = avail_inodes; buf->f_ffree = avail_inodes;