diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 11:12:14 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-31 12:18:37 -0400 |
| commit | e677179b35b7ecbe3cefe33011b69d45171e5e9f (patch) | |
| tree | ac09673fe202f01873a29f8ce7d23cabe2d780ac /fs/bcachefs/super.c | |
| parent | 37707bb183b4746f27b0beaf0c3273fd7c79dc66 (diff) | |
| download | linux-e677179b35b7ecbe3cefe33011b69d45171e5e9f.tar.gz linux-e677179b35b7ecbe3cefe33011b69d45171e5e9f.tar.bz2 linux-e677179b35b7ecbe3cefe33011b69d45171e5e9f.zip | |
bcachefs: bch2_disk_path_to_text() no longer takes sb_lock
We're going to be using bch2_target_to_text() ->
bch2_disk_path_to_text() from bch2_bkey_ptrs_to_text() and
bch2_bkey_ptrs_invalid(), which can be called in any context.
This patch adds the actual label to bch_disk_group_cpu so that it can be
used by bch2_disk_path_to_text, and splits out bch2_disk_path_to_text()
into two variants - like the previous patch, one for when we have a
running filesystem and another for when we only have a superblock.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/super.c')
| -rw-r--r-- | fs/bcachefs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c index 9d59d6246ed6..ce59018b27ac 100644 --- a/fs/bcachefs/super.c +++ b/fs/bcachefs/super.c @@ -1582,7 +1582,7 @@ int bch2_dev_add(struct bch_fs *c, const char *path) dev_mi = bch2_sb_member_get(sb.sb, sb.sb->dev_idx); if (BCH_MEMBER_GROUP(&dev_mi)) { - bch2_disk_path_to_text(&label, sb.sb, BCH_MEMBER_GROUP(&dev_mi) - 1); + bch2_disk_path_to_text_sb(&label, sb.sb, BCH_MEMBER_GROUP(&dev_mi) - 1); if (label.allocation_failure) { ret = -ENOMEM; goto err; |