diff options
Diffstat (limited to 'fs/bcachefs')
| -rw-r--r-- | fs/bcachefs/bcachefs_format.h | 5 | ||||
| -rw-r--r-- | fs/bcachefs/btree_key_cache.c | 4 | ||||
| -rw-r--r-- | fs/bcachefs/dirent.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/journal_io.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/recovery.c | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h index a84a8e088953..969507c42c55 100644 --- a/fs/bcachefs/bcachefs_format.h +++ b/fs/bcachefs/bcachefs_format.h @@ -851,10 +851,9 @@ struct bch_dirent { #define DT_SUBVOL 16 #define BCH_DT_MAX 17 -#define BCH_NAME_MAX (U8_MAX * sizeof(u64) - \ +#define BCH_NAME_MAX ((unsigned) (U8_MAX * sizeof(u64) - \ sizeof(struct bkey) - \ - offsetof(struct bch_dirent, d_name)) - + offsetof(struct bch_dirent, d_name))) /* Xattrs */ diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c index f856dee0c3aa..f86d57d1ace0 100644 --- a/fs/bcachefs/btree_key_cache.c +++ b/fs/bcachefs/btree_key_cache.c @@ -742,8 +742,8 @@ int bch2_fs_btree_key_cache_init(struct btree_key_cache *bc) void bch2_btree_key_cache_to_text(struct printbuf *out, struct btree_key_cache *c) { pr_buf(out, "nr_freed:\t%zu\n", c->nr_freed); - pr_buf(out, "nr_keys:\t%zu\n", atomic_long_read(&c->nr_keys)); - pr_buf(out, "nr_dirty:\t%zu\n", atomic_long_read(&c->nr_dirty)); + pr_buf(out, "nr_keys:\t%lu\n", atomic_long_read(&c->nr_keys)); + pr_buf(out, "nr_dirty:\t%lu\n", atomic_long_read(&c->nr_dirty)); } void bch2_btree_key_cache_exit(void) diff --git a/fs/bcachefs/dirent.c b/fs/bcachefs/dirent.c index 281959885bb0..716c85062cea 100644 --- a/fs/bcachefs/dirent.c +++ b/fs/bcachefs/dirent.c @@ -108,7 +108,7 @@ int bch2_dirent_invalid(const struct bch_fs *c, struct bkey_s_c k, } if (len > BCH_NAME_MAX) { - pr_buf(err, "dirent name too big (%u > %lu)", + pr_buf(err, "dirent name too big (%u > %u)", len, BCH_NAME_MAX); return -EINVAL; } diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c index c84c0b840906..64341da75963 100644 --- a/fs/bcachefs/journal_io.c +++ b/fs/bcachefs/journal_io.c @@ -987,7 +987,7 @@ static void bch2_journal_read_device(struct closure *cl) for (i = 0; i < r->nr_ptrs; i++) { if (r->ptrs[i].dev == ca->dev_idx && sector_to_bucket(ca, r->ptrs[i].sector) == ja->buckets[ja->cur_idx]) { - unsigned wrote = (r->ptrs[i].sector % ca->mi.bucket_size) + + unsigned wrote = bucket_remainder(ca, r->ptrs[i].sector) + vstruct_sectors(&r->j, c->block_bits); ja->sectors_free = min(ja->sectors_free, diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 07ce6a540856..9269cb686e4d 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -198,7 +198,7 @@ int bch2_journal_key_insert_take(struct bch_fs *c, enum btree_id id, if (keys->nr == keys->size) { struct journal_keys new_keys = { .nr = keys->nr, - .size = max(keys->size, 8UL) * 2, + .size = max_t(size_t, keys->size, 8) * 2, .journal_seq_base = keys->journal_seq_base, }; |