diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-12-14 16:05:47 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-12 20:13:35 -0500 |
| commit | a2e848f2d0be068f868397e87c9be0ae79fd7616 (patch) | |
| tree | 1e375c0b5040be4820ce91454f534c6df50c4b42 | |
| parent | c1a2e0ed252114872c47321dbe48d4711d251f8b (diff) | |
bcachefs: Fix debug build in userspace
This fixes some compiler warnings that only trigger in userspace - dead
code, a maybe uninitialed variable, a maybe null ptr passed to printk.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/btree_io.c | 3 | ||||
| -rw-r--r-- | fs/bcachefs/dirent.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/inode.c | 10 |
3 files changed, 3 insertions, 12 deletions
diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c index f11fcab61902..c19c3acbc2b9 100644 --- a/fs/bcachefs/btree_io.c +++ b/fs/bcachefs/btree_io.c @@ -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: \ diff --git a/fs/bcachefs/dirent.c b/fs/bcachefs/dirent.c index a165d08c3668..6f699b736b34 100644 --- a/fs/bcachefs/dirent.c +++ b/fs/bcachefs/dirent.c @@ -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)); diff --git a/fs/bcachefs/inode.c b/fs/bcachefs/inode.c index ffce68a80490..99b2a77ef9a8 100644 --- a/fs/bcachefs/inode.c +++ b/fs/bcachefs/inode.c @@ -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) |