Skip to contentSkip to conversation

btrfs-progs: disk-io: Remove duplicated ASSERT() call

PATCH Applied Qu Wenruo 2 participants 2 messages Dec 10, 2019 – Jan 2, 2020 Btrfs file system

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

PATCH 1/1 btrfs-progs: disk-io: Remove duplicated ASSERT() call

There are two ASSERT() with completely the same check introduced in commit f7717d8cdb7d ("btrfs-progs: Remove fsid/metdata_uuid fields from fs_info").

Just remove it.

Fixes f7717d8cdb7d ("btrfs-progs: Remove fsid/metdata_uuid fields from fs_info")
---
 disk-io.c | 1 -
 1 file changed, 1 deletion(-)
disk-io.c +0 -1
index 659f8b93a7ca..8fe811e861fc 100644
@@ -1248,7 +1248,6 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
 		goto out_devices;
 	}
 
-	ASSERT(!memcmp(disk_super->fsid, fs_devices->fsid, BTRFS_FSID_SIZE));
 	ASSERT(!memcmp(disk_super->fsid, fs_devices->fsid, BTRFS_FSID_SIZE));
 	if (btrfs_fs_incompat(fs_info, METADATA_UUID))
 		ASSERT(!memcmp(disk_super->metadata_uuid,
Signature · 1 line
2.24.0
Applied
#1 lore raw
Quoted 8 lines · Qu Wenruo

There are two ASSERT() with completely the same check introduced in commit f7717d8cdb7d ("btrfs-progs: Remove fsid/metdata_uuid fields from fs_info").

Just remove it.

Fixes f7717d8cdb7d ("btrfs-progs: Remove fsid/metdata_uuid fields from fs_info")

Applied, thanks.