mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

bcachefs: Fix error message on bucket sector count overflow

Browse source 
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2020-02-26 22:29:52 -05:00 committed by Kent Overstreet
parent f1f5f114cd
commit 38f0664a5f
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/bcachefs/buckets.c
View file

@ -1444,8 +1444,7 @@ static int bch2_trans_mark_pointer(struct btree_trans *trans,
struct bkey_s_c k; struct bkey_s_c k;
struct bkey_alloc_unpacked u; struct bkey_alloc_unpacked u;
struct bkey_i_alloc *a; struct bkey_i_alloc *a;
u16 *dst_sectors; u16 *dst_sectors, orig_sectors;
bool overflow;
int ret; int ret;
ret = trans_get_key(trans, BTREE_ID_ALLOC, ret = trans_get_key(trans, BTREE_ID_ALLOC,
@ -1502,13 +1501,12 @@ static int bch2_trans_mark_pointer(struct btree_trans *trans,
dst_sectors = !p.ptr.cached dst_sectors = !p.ptr.cached
? &u.dirty_sectors ? &u.dirty_sectors
: &u.cached_sectors; : &u.cached_sectors;
orig_sectors = *dst_sectors;
overflow = checked_add(*dst_sectors, sectors); if (checked_add(*dst_sectors, sectors)) {
if (overflow) {
bch2_fs_inconsistent(c, bch2_fs_inconsistent(c,
"bucket sector count overflow: %u + %lli > U16_MAX", "bucket sector count overflow: %u + %lli > U16_MAX",
*dst_sectors, sectors); orig_sectors, sectors);
/* return an error indicating that we need full fsck */ /* return an error indicating that we need full fsck */
ret = -EIO; ret = -EIO;
goto out; goto out;