X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_scrub.c;h=56a718b058d04833df978bc355cefd623ff879c9;hb=604c266a175b72500ef99793652b64ed4f842b2c;hp=58914aed8b6c6d0caa2bab85af835b1038ece186;hpb=4c2f028a95063aa30006a071a039e8a3eefe52f2;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_scrub.c b/lustre/osd-zfs/osd_scrub.c
index 58914ae..56a718b 100644
--- a/lustre/osd-zfs/osd_scrub.c
+++ b/lustre/osd-zfs/osd_scrub.c
@@ -701,7 +701,7 @@ static const struct osd_lf_map osd_lf_maps[] = {
 
 	/* PENDING */
 	{
-		.olm_name		= "PENDING",
+		.olm_name		= MDT_ORPHAN_DIR,
 	},
 
 	/* ROOT */
@@ -1387,7 +1387,7 @@ int osd_scrub_start(const struct lu_env *env, struct osd_device *dev,
 	RETURN(rc == -EALREADY ? 0 : rc);
 }
 
-static void osd_scrub_stop(struct osd_device *dev)
+void osd_scrub_stop(struct osd_device *dev)
 {
 	struct lustre_scrub *scrub = &dev->od_scrub;
 	ENTRY;
@@ -1448,6 +1448,7 @@ int osd_scrub_setup(const struct lu_env *env, struct osd_device *dev)
 	if (IS_ERR_OR_NULL(obj))
 		RETURN(obj ? PTR_ERR(obj) : -ENOENT);
 
+	obj->do_body_ops = &osd_body_scrub_ops;
 	scrub->os_obj = obj;
 	rc = scrub_file_load(env, scrub);
 	if (rc == -ENOENT || rc == -EFAULT) {
@@ -1467,10 +1468,11 @@ int osd_scrub_setup(const struct lu_env *env, struct osd_device *dev)
 				       "failed to allocate RAM for report\n",
 				       osd_name(dev));
 			} else {
-				class_uuid_unparse(sf->sf_uuid, old_uuid);
-				class_uuid_unparse(dev->od_uuid, new_uuid);
-				CDEBUG(D_LFSCK, "%s: UUID has been changed "
-				       "from %s to %s\n", osd_name(dev),
+				snprintf(old_uuid->uuid, UUID_SIZE, "%pU", sf->sf_uuid);
+				snprintf(new_uuid->uuid, UUID_SIZE, "%pU", dev->od_uuid);
+				CDEBUG(D_LFSCK,
+				       "%s: UUID has been changed from %s to %s\n",
+				       osd_name(dev),
 				       old_uuid->uuid, new_uuid->uuid);
 			}
 			scrub_file_reset(scrub, dev->od_uuid, SF_INCONSISTENT);