diff options
author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-03-30 17:46:47 -0400 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-03-30 17:46:47 -0400 |
commit | c452666fb3dbda3edb5a442a187d3313d600cccc (patch) | |
tree | 76e05ddd3a4f969ac39bb1524e255c7fc28ba920 | |
parent | fad8236b812f795993b88804065d950709a6c13c (diff) |
Update bcachefs sources to a897b0f199 bcachefs: Fix a locking bug
-rw-r--r-- | .bcachefs_revision | 2 | ||||
-rw-r--r-- | libbcachefs/btree_io.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.bcachefs_revision b/.bcachefs_revision index f4299658..de5c4792 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -275cba438ed6630d5e4db7c9164ac5334a8a4cd7 +a897b0f199b2fb888f5885f115306759199094dd diff --git a/libbcachefs/btree_io.h b/libbcachefs/btree_io.h index 1f16394f..337d2bdd 100644 --- a/libbcachefs/btree_io.h +++ b/libbcachefs/btree_io.h @@ -114,7 +114,7 @@ static inline void btree_node_write_if_need(struct bch_fs *c, struct btree *b, break; } - six_unlock_read(&b->lock); + six_unlock_type(&b->lock, lock_held); btree_node_wait_on_io(b); btree_node_lock_type(c, b, lock_held); } |