averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-22 09:34:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

bcachefs: bch2_dev_add() can run on a non-started fs

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet
2025-05-21 20:14:37 -04:00
parent a349868b5e
commit 98e5e36d8c
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/bcachefs/super.c
+20 -17
View File
@@ -1894,6 +1894,7 @@ int bch2_dev_add(struct bch_fs *c, const char *path)
goto err_unlock;
}
unsigned dev_idx = ret;
ret = 0;
/* success: */
@@ -1913,27 +1914,29 @@ int bch2_dev_add(struct bch_fs *c, const char *path)
bch2_write_super(c);
mutex_unlock(&c->sb_lock);
ret = bch2_dev_usage_init(ca, false);
if (ret)
goto err_late;
if (test_bit(BCH_FS_started, &c->flags)) {
ret = bch2_dev_usage_init(ca, false);
if (ret)
goto err_late;
ret = bch2_trans_mark_dev_sb(c, ca, BTREE_TRIGGER_transactional);
bch_err_msg(ca, ret, "marking new superblock");
if (ret)
goto err_late;
ret = bch2_trans_mark_dev_sb(c, ca, BTREE_TRIGGER_transactional);
bch_err_msg(ca, ret, "marking new superblock");
if (ret)
goto err_late;
ret = bch2_fs_freespace_init(c);
bch_err_msg(ca, ret, "initializing free space");
if (ret)
goto err_late;
ret = bch2_fs_freespace_init(c);
bch_err_msg(ca, ret, "initializing free space");
if (ret)
goto err_late;
if (ca->mi.state == BCH_MEMBER_STATE_rw)
__bch2_dev_read_write(c, ca);
if (ca->mi.state == BCH_MEMBER_STATE_rw)
__bch2_dev_read_write(c, ca);
ret = bch2_dev_journal_alloc(ca, false);
bch_err_msg(c, ret, "allocating journal");
if (ret)
goto err_late;
ret = bch2_dev_journal_alloc(ca, false);
bch_err_msg(c, ret, "allocating journal");
if (ret)
goto err_late;
}
up_write(&c->state_lock);
out: