torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-02 20:49:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

bcachefs: Fix bch2_mark_update()

Browse Source 
When the old or new key doesn't exist, we should still pass in a deleted
key with the correct pos. This fixes a bug in the ec code, when
bch2_mark_stripe() was looking up the wrong in-memory stripe.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet
2021-10-29 18:21:05 -04:00
committed by Kent Overstreet
parent fae1157d18
commit 37f72492f4
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/bcachefs/buckets.c
View File

@@ -1231,6 +1231,8 @@ int bch2_mark_key(struct bch_fs *c, struct bkey_s_c new, unsigned flags)
struct bkey_s_c old = (struct bkey_s_c) { &deleted, NULL };
int ret;
deleted.p = new.k->p;
percpu_down_read(&c->mark_lock);
ret = bch2_mark_key_locked(c, old, new, 0, flags);
percpu_up_read(&c->mark_lock);
@@ -1248,6 +1250,8 @@ int bch2_mark_update(struct btree_trans *trans, struct btree_path *path,
struct bkey unpacked;
int ret;
_deleted.p = path->pos;
if (unlikely(flags & BTREE_TRIGGER_NORUN))
return 0;
@@ -1846,6 +1850,8 @@ int bch2_trans_mark_update(struct btree_trans *trans,
struct bkey unpacked;
int ret;
_deleted.p = path->pos;
if (unlikely(flags & BTREE_TRIGGER_NORUN))
return 0;