X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_scrub.c;h=a9a191d409300170a66881a8a020ea3fcc86a373;hp=91ed16a96216242e36bf0c27788a551b0a332b88;hb=d11360f4cc5d38cd748a97ca05e10121353ae616;hpb=a0e2135e3f12c6a19bf211533a4ba070c4783e6d

diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c
index 91ed16a..a9a191d 100644
--- a/lustre/osd-ldiskfs/osd_scrub.c
+++ b/lustre/osd-ldiskfs/osd_scrub.c
@@ -582,9 +582,6 @@ iget:
 			sf->sf_items_updated_prior++;
 		else
 			sf->sf_items_updated++;
-
-		/* The target has been changed, need to be re-loaded. */
-		lu_object_purge(info->oti_env, osd2lu_dev(dev), fid);
 	}
 
 	GOTO(out, rc);
@@ -2221,7 +2218,8 @@ static int do_osd_scrub_start(struct osd_device *dev, __u32 flags)
 again:
 	if (thread_is_running(thread)) {
 		spin_unlock(&scrub->os_lock);
-		if (!scrub->os_partial_scan || flags & SS_AUTO_PARTIAL)
+		if (!(scrub->os_file.sf_flags & SF_AUTO) ||
+		     (flags & (SS_AUTO_FULL | SS_AUTO_PARTIAL)))
 			RETURN(-EALREADY);
 
 		osd_scrub_join(dev, flags, false);