From c452666fb3dbda3edb5a442a187d3313d600cccc Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Mon, 30 Mar 2020 17:46:47 -0400 Subject: [PATCH] Update bcachefs sources to a897b0f199 bcachefs: Fix a locking bug --- .bcachefs_revision | 2 +- 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); }