From cfa816bf3f823a3bedfedd8e214ea929c5c755fe Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 24 Jun 2023 12:50:52 -0400 Subject: Update bcachefs sources to 84f132d569 bcachefs: fsck: Break walk_inode() up into multiple functions Signed-off-by: Kent Overstreet --- libbcachefs/super.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libbcachefs/super.c') diff --git a/libbcachefs/super.c b/libbcachefs/super.c index 2754f02..99b7670 100644 --- a/libbcachefs/super.c +++ b/libbcachefs/super.c @@ -139,20 +139,20 @@ found: return c; } -static struct bch_fs *__bch2_uuid_to_fs(uuid_le uuid) +static struct bch_fs *__bch2_uuid_to_fs(__uuid_t uuid) { struct bch_fs *c; lockdep_assert_held(&bch_fs_list_lock); list_for_each_entry(c, &bch_fs_list, list) - if (!memcmp(&c->disk_sb.sb->uuid, &uuid, sizeof(uuid_le))) + if (!memcmp(&c->disk_sb.sb->uuid, &uuid, sizeof(uuid))) return c; return NULL; } -struct bch_fs *bch2_uuid_to_fs(uuid_le uuid) +struct bch_fs *bch2_uuid_to_fs(__uuid_t uuid) { struct bch_fs *c; @@ -997,7 +997,7 @@ static int bch2_dev_in_fs(struct bch_sb *fs, struct bch_sb *sb) le64_to_cpu(fs->seq) > le64_to_cpu(sb->seq) ? fs : sb; struct bch_sb_field_members *mi = bch2_sb_get_members(newest); - if (uuid_le_cmp(fs->uuid, sb->uuid)) + if (!uuid_equal(&fs->uuid, &sb->uuid)) return -BCH_ERR_device_not_a_member_of_filesystem; if (!bch2_dev_exists(newest, mi, sb->dev_idx)) -- cgit v1.2.3