[PATCH v2 01/29] xfsprogs: Stop using platform_uuid_compare()

Pavel Reichl
2021-08-06T21:23:26Z

platform_uuid_compare() only calls uuid_compare() thus in should be
replaced by uuid_compare() deprecated and removed in the future.
---
copy/xfs_copy.c | 2 +-
db/sb.c | 2 +-
libxfs/libxfs_priv.h | 2 +-
libxlog/util.c | 2 +-
repair/agheader.c | 4 ++--
repair/attr_repair.c | 2 +-
repair/dinode.c | 6 +++---
repair/phase6.c | 2 +-
repair/scan.c | 4 ++--
9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index fc7d225f..841ab7e4 100644
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -15,7 +15,7 @@
#include "libfrog/platform.h"

#define rounddown(x, y) (((x)/(y))*(y))
-#define uuid_equal(s,d) (platform_uuid_compare((s),(d)) == 0)
+#define uuid_equal(s,d) (uuid_compare((*s),(*d)) == 0)

extern int platform_check_ismounted(char *, char *, struct stat *, int);

diff --git a/db/sb.c b/db/sb.c
index cec7dce9..7017e1e5 100644
--- a/db/sb.c
+++ b/db/sb.c
@@ -17,7 +17,7 @@
#include "output.h"
#include "init.h"

-#define uuid_equal(s,d) (platform_uuid_compare((s),(d)) == 0)
+#define uuid_equal(s,d) (uuid_compare((*s),(*d)) == 0)

static int sb_f(int argc, char **argv);
static void sb_help(void);
diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index e37d5933..782bb006 100644
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -505,7 +505,7 @@ static inline int retzero(void) { return 0; }
#define xfs_qm_dqattach(i) (0)

#define uuid_copy(s,d) platform_uuid_copy((s),(d))
-#define uuid_equal(s,d) (platform_uuid_compare((s),(d)) == 0)
+#define uuid_equal(s,d) (uuid_compare((*s),(*d)) == 0)

#define xfs_icreate_log(tp, agno, agbno, cnt, isize, len, gen) ((void) 0)
#define xfs_sb_validate_fsb_count(sbp, nblks) (0)
diff --git a/libxlog/util.c b/libxlog/util.c
index a85d70c9..b4dfeca0 100644
--- a/libxlog/util.c
+++ b/libxlog/util.c
@@ -76,7 +76,7 @@ header_check_uuid(xfs_mount_t *mp, xlog_rec_header_t *head)

if (print_skip_uuid)
return 0;
- if (!platform_uuid_compare(&mp->m_sb.sb_uuid, &head->h_fs_uuid))
+ if (!uuid_compare(mp->m_sb.sb_uuid, head->h_fs_uuid))
return 0;

platform_uuid_unparse(&mp->m_sb.sb_uuid, uu_sb);
diff --git a/repair/agheader.c b/repair/agheader.c
index 2af24106..1c4138e4 100644
--- a/repair/agheader.c
+++ b/repair/agheader.c
@@ -100,7 +100,7 @@ verify_set_agf(xfs_mount_t *mp, xfs_agf_t *agf, xfs_agnumber_t i)
if (!xfs_sb_version_hascrc(&mp->m_sb))
return retval;

- if (platform_uuid_compare(&agf->agf_uuid, &mp->m_sb.sb_meta_uuid)) {
+ if (uuid_compare(agf->agf_uuid, mp->m_sb.sb_meta_uuid)) {
char uu[64];

retval = XR_AG_AGF;
@@ -179,7 +179,7 @@ verify_set_agi(xfs_mount_t *mp, xfs_agi_t *agi, xfs_agnumber_t agno)
if (!xfs_sb_version_hascrc(&mp->m_sb))
return retval;

- if (platform_uuid_compare(&agi->agi_uuid, &mp->m_sb.sb_meta_uuid)) {
+ if (uuid_compare(agi->agi_uuid, mp->m_sb.sb_meta_uuid)) {
char uu[64];

retval = XR_AG_AGI;
diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index bc3c2bef..25bdff73 100644
--- a/repair/attr_repair.c
+++ b/repair/attr_repair.c
@@ -947,7 +947,7 @@ _("expected block %" PRIu64 ", got %llu, inode %" PRIu64 "attr block\n"),
return 1;
}
/* verify uuid */
- if (platform_uuid_compare(&info->uuid, &mp->m_sb.sb_meta_uuid) != 0) {
+ if (uuid_compare(info->uuid, mp->m_sb.sb_meta_uuid) != 0) {
do_warn(
_("wrong FS UUID, inode %" PRIu64 " attr block %" PRIu64 "\n"),
ino, bp->b_bn);
diff --git a/repair/dinode.c b/repair/dinode.c
index 291c5807..a6156830 100644
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -1098,7 +1098,7 @@ null_check(char *name, int length)
* This does /not/ do quotacheck, it validates the basic quota
* inode metadata, checksums, etc.
*/
-#define uuid_equal(s,d) (platform_uuid_compare((s),(d)) == 0)
+#define uuid_equal(s,d) (uuid_compare((*s),(*d)) == 0)
static int
process_quota_inode(
struct xfs_mount *mp,
@@ -2329,8 +2329,8 @@ _("inode identifier %llu mismatch on inode %" PRIu64 "\n"),
return 1;
goto clear_bad_out;
}
- if (platform_uuid_compare(&dino->di_uuid,
- &mp->m_sb.sb_meta_uuid)) {
+ if (uuid_compare(dino->di_uuid,
+ mp->m_sb.sb_meta_uuid)) {
if (!uncertain)
do_warn(
_("UUID mismatch on inode %" PRIu64 "\n"), lino);
diff --git a/repair/phase6.c b/repair/phase6.c
index 6bddfefa..05e6a321 100644
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -1886,7 +1886,7 @@ _("expected block %" PRIu64 ", got %llu, directory inode %" PRIu64 "\n"),
return 1;
}
/* verify uuid */
- if (platform_uuid_compare(uuid, &mp->m_sb.sb_meta_uuid) != 0) {
+ if (uuid_compare(*uuid, mp->m_sb.sb_meta_uuid) != 0) {
do_warn(
_("wrong FS UUID, directory inode %" PRIu64 " block %" PRIu64 "\n"),
ino, bp->b_bn);
diff --git a/repair/scan.c b/repair/scan.c
index 2c25af57..361c3b3c 100644
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -268,8 +268,8 @@ _("expected block %" PRIu64 ", got %llu, bmbt block %" PRIu64 "\n"),
return 1;
}
/* verify uuid */
- if (platform_uuid_compare(&block->bb_u.l.bb_uuid,
- &mp->m_sb.sb_meta_uuid) != 0) {
+ if (uuid_compare(block->bb_u.l.bb_uuid,
+ mp->m_sb.sb_meta_uuid) != 0) {
do_warn(
_("wrong FS UUID, bmbt block %" PRIu64 "\n"),
bno);
--
2.31.1