LU-11803 obd: replace class_uuid with linux kernel version.

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_scrub.c

diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c
index 6232235..8d405ba 100644 (file)
--- a/lustre/osd-ldiskfs/osd_scrub.c
+++ b/lustre/osd-ldiskfs/osd_scrub.c
@@ -627,8 +627,8 @@ static int osd_scrub_check_local_fldb(struct osd_thread_info *info,
         *      quite possible for FID-on-MDT. */
        if (dev->od_is_ost)
                return SCRUB_NEXT_OSTOBJ_OLD;
-       else
-               return 0;
+
+       return 0;
 }
 
 static int osd_scrub_get_fid(struct osd_thread_info *info,
@@ -636,8 +636,8 @@ static int osd_scrub_get_fid(struct osd_thread_info *info,
                             struct lu_fid *fid, bool scrub)
 {
        struct lustre_mdt_attrs *lma = &info->oti_ost_attrs.loa_lma;
-       int rc;
        bool has_lma = false;
+       int rc;
 
        rc = osd_get_lma(info, inode, &info->oti_obj_dentry,
                         &info->oti_ost_attrs);
@@ -2669,8 +2669,10 @@ int osd_scrub_setup(const struct lu_env *env, struct osd_device *dev)
                                       "failed to allocate RAM for report\n",
                                       osd_dev2name(dev));
                        } else {
-                               class_uuid_unparse(sf->sf_uuid, old_uuid);
-                               class_uuid_unparse(es->s_uuid, new_uuid);
+                               snprintf(old_uuid->uuid, UUID_SIZE, "%pU",
+                                        sf->sf_uuid);
+                               snprintf(new_uuid->uuid, UUID_SIZE, "%pU",
+                                        es->s_uuid);
                                CDEBUG(D_LFSCK, "%s: UUID has been changed "
                                       "from %s to %s\n", osd_dev2name(dev),
                                       old_uuid->uuid, new_uuid->uuid);