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

Update bcachefs sources to 635ca475f4 bcachefs: Fix debug build in userspace

Browse Source
This commit is contained in:
Kent Overstreet 2021-12-14 16:15:21 -05:00
parent 57f6402131
commit b19d9f92e1
5 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
6bb1ba5c94c225a95cb59cb9670b558bcb1b4f81
635ca475f4f40ddcb2976f8f20a89df4c574aa22

3
libbcachefs/btree_io.c
View File

@ -566,7 +566,8 @@ enum btree_validate_ret {
\
switch (write) { \
case READ: \
bch_err(c, "%s", _buf2); \
if (_buf2) \
bch_err(c, "%s", _buf2); \
\
switch (type) { \
case BTREE_ERR_FIXABLE: \

2
libbcachefs/debug.c
View File

@ -406,6 +406,8 @@ static ssize_t bch2_read_bfloat_failed(struct file *file, char __user *buf,
if (!i->size)
break;
}
bch2_trans_iter_exit(&trans, &iter);
bch2_trans_exit(&trans);
return err < 0 ? err : i->ret;

2
libbcachefs/dirent.c
View File

@ -230,7 +230,7 @@ int bch2_dirent_rename(struct btree_trans *trans,
{
struct btree_iter src_iter = { NULL };
struct btree_iter dst_iter = { NULL };
struct bkey_s_c old_src, old_dst;
struct bkey_s_c old_src, old_dst = bkey_s_c_null;
struct bkey_i_dirent *new_src = NULL, *new_dst = NULL;
struct bpos dst_pos =
POS(dst_dir.inum, bch2_dirent_hash(dst_hash, dst_name));

10
libbcachefs/inode.c
View File

@ -24,16 +24,6 @@ const char * const bch2_inode_opts[] = {
};
static const u8 byte_table[8] = { 1, 2, 3, 4, 6, 8, 10, 13 };
static const u8 bits_table[8] = {
1 * 8 - 1,
2 * 8 - 2,
3 * 8 - 3,
4 * 8 - 4,
6 * 8 - 5,
8 * 8 - 6,
10 * 8 - 7,
13 * 8 - 8,
};
static int inode_decode_field(const u8 *in, const u8 *end,
u64 out[2], unsigned *out_bits)