c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-28 17:39:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

More consistent use of TREE_* macros in AVL comparators

Browse Source 
Where is it appropriate and obvious, use TREE_CMP(), TREE_ISIGN() and
TREE_PCMP() instead or direct comparisons. It can make the code a lot
smaller, less error prone, and easier to read.

Sponsored-by: TrueNAS
Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rob Norris <rob.norris@truenas.com>
Closes #18259
This commit is contained in:
Rob Norris
2026-03-04 04:08:23 +11:00
committed by GitHub
parent 0f90a797dd
commit 1e2c94a043
19 changed files with 88 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zfs/zio.c
+15 -22
View File
@@ -910,33 +910,26 @@ zio_bookmark_compare(const void *x1, const void *x2)
{
const zio_t *z1 = x1;
const zio_t *z2 = x2;
const zbookmark_phys_t *zb1 = &z1->io_bookmark;
const zbookmark_phys_t *zb2 = &z2->io_bookmark;
if (z1->io_bookmark.zb_objset < z2->io_bookmark.zb_objset)
return (-1);
if (z1->io_bookmark.zb_objset > z2->io_bookmark.zb_objset)
return (1);
int cmp = TREE_CMP(zb1->zb_objset, zb2->zb_objset);
if (cmp != 0)
return (cmp);
if (z1->io_bookmark.zb_object < z2->io_bookmark.zb_object)
return (-1);
if (z1->io_bookmark.zb_object > z2->io_bookmark.zb_object)
return (1);
cmp = TREE_CMP(zb1->zb_object, zb2->zb_object);
if (cmp != 0)
return (cmp);
if (z1->io_bookmark.zb_level < z2->io_bookmark.zb_level)
return (-1);
if (z1->io_bookmark.zb_level > z2->io_bookmark.zb_level)
return (1);
cmp = TREE_CMP(zb1->zb_level, zb2->zb_level);
if (cmp != 0)
return (cmp);
if (z1->io_bookmark.zb_blkid < z2->io_bookmark.zb_blkid)
return (-1);
if (z1->io_bookmark.zb_blkid > z2->io_bookmark.zb_blkid)
return (1);
cmp = TREE_CMP(zb1->zb_blkid, zb2->zb_blkid);
if (cmp != 0)
return (cmp);
if (z1 < z2)
return (-1);
if (z1 > z2)
return (1);
return (0);
return (TREE_PCMP(z1, z2));
}
/*