LU-6147 lfsck: NOT purge object by OI scrub

[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 4b3e4a1..a9a191d 100644 (file)
--- 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);
@@ -1966,7 +1963,7 @@ osd_ios_general_scan(struct osd_thread_info *info, struct osd_device *dev,
                                                .oifb_info = info,
                                                .oifb_dev = dev,
                                                .oifb_dentry = dentry };
-       struct file                  *filp  = &info->oti_it_ea.oie_file;
+       struct file                  *filp  = &info->oti_file;
        struct inode                 *inode = dentry->d_inode;
        const struct file_operations *fops  = inode->i_fop;
        int                           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);