From 19f921604d3bacf7a8b243d0548b408bd93e8827 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Tue, 26 Jan 2021 21:00:48 -0500 Subject: [PATCH] Update bcachefs sources to ffc900d593 fixup! bcachefs: Mark superblocks transactionally --- .bcachefs_revision | 2 +- libbcachefs/super.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.bcachefs_revision b/.bcachefs_revision index ee5b7e5c..49026414 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -313b24b652d521c6ba4a965f7033c73575923a91 +ffc900d5936ae538e34d18a6ce739d0a5a9178cf diff --git a/libbcachefs/super.c b/libbcachefs/super.c index 00681533..9f7a6f1f 100644 --- a/libbcachefs/super.c +++ b/libbcachefs/super.c @@ -1713,12 +1713,13 @@ int bch2_dev_online(struct bch_fs *c, const char *path) goto err; } + ca = bch_dev_locked(c, dev_idx); + if (bch2_trans_mark_dev_sb(c, NULL, ca)) { err = "bch2_trans_mark_dev_sb() error"; goto err; } - ca = bch_dev_locked(c, dev_idx); if (ca->mi.state == BCH_MEMBER_STATE_RW) { err = __bch2_dev_read_write(c, ca); if (err)