Revert "LU-7782 scrub: handle slave obj of striped directory"

[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 f5c7f13..3cd4e8c 100644 (file)
--- a/lustre/osd-ldiskfs/osd_scrub.c
+++ b/lustre/osd-ldiskfs/osd_scrub.c
@@ -1223,16 +1223,16 @@ static void osd_scrub_join(struct osd_device *dev, __u32 flags,
                sf->sf_status = SS_SCANNING;
        }
 
-       if (sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT | SF_UPGRADE))
-               scrub->os_full_speed = 1;
-       else
-               scrub->os_full_speed = 0;
-
        if (flags & SS_AUTO_FULL) {
                sf->sf_flags |= SF_AUTO;
                scrub->os_full_speed = 1;
        }
 
+       if (sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT | SF_UPGRADE))
+               scrub->os_full_speed = 1;
+       else
+               scrub->os_full_speed = 0;
+
        scrub->os_new_checked = 0;
        if (sf->sf_pos_last_checkpoint != 0)
                sf->sf_pos_latest_start = sf->sf_pos_last_checkpoint + 1;
@@ -1899,11 +1899,11 @@ osd_ios_scan_one(struct osd_thread_info *info, struct osd_device *dev,
  * or filter_fid_old), move them back to its proper /O/<seq>/d<x>.
  */
 #ifdef HAVE_FILLDIR_USE_CTX
-static int osd_ios_lf_fill(struct dir_context *buf,
+static int osd_ios_lf_fill(struct dir_context *buf, const char *name,
+                          int namelen,
 #else
-static int osd_ios_lf_fill(void *buf,
+static int osd_ios_lf_fill(void *buf, const char *name, int namelen,
 #endif
-                          const char *name, int namelen,
                           loff_t offset, __u64 ino, unsigned d_type)
 {
        struct osd_ios_filldir_buf *fill_buf =
@@ -1973,11 +1973,11 @@ put:
 }
 
 #ifdef HAVE_FILLDIR_USE_CTX
-static int osd_ios_varfid_fill(struct dir_context *buf,
+static int osd_ios_varfid_fill(struct dir_context  *buf, const char *name,
+                              int namelen,
 #else
-static int osd_ios_varfid_fill(void *buf,
+static int osd_ios_varfid_fill(void *buf, const char *name, int namelen,
 #endif
-                              const char *name, int namelen,
                               loff_t offset, __u64 ino, unsigned d_type)
 {
        struct osd_ios_filldir_buf *fill_buf =
@@ -2006,11 +2006,11 @@ static int osd_ios_varfid_fill(void *buf,
 }
 
 #ifdef HAVE_FILLDIR_USE_CTX
-static int osd_ios_dl_fill(struct dir_context *buf,
+static int osd_ios_dl_fill(struct dir_context  *buf, const char *name,
+                          int namelen,
 #else
-static int osd_ios_dl_fill(void *buf,
+static int osd_ios_dl_fill(void *buf, const char *name, int namelen,
 #endif
-                          const char *name, int namelen,
                           loff_t offset, __u64 ino, unsigned d_type)
 {
        struct osd_ios_filldir_buf *fill_buf =
@@ -2048,11 +2048,11 @@ static int osd_ios_dl_fill(void *buf,
 }
 
 #ifdef HAVE_FILLDIR_USE_CTX
-static int osd_ios_uld_fill(struct dir_context *buf,
+static int osd_ios_uld_fill(struct dir_context *buf, const char *name,
+                           int namelen,
 #else
-static int osd_ios_uld_fill(void *buf,
+static int osd_ios_uld_fill(void *buf, const char *name, int namelen,
 #endif
-                           const char *name, int namelen,
                            loff_t offset, __u64 ino, unsigned d_type)
 {
        struct osd_ios_filldir_buf *fill_buf =
@@ -2083,11 +2083,11 @@ static int osd_ios_uld_fill(void *buf,
 }
 
 #ifdef HAVE_FILLDIR_USE_CTX
-static int osd_ios_root_fill(struct dir_context *buf,
+static int osd_ios_root_fill(struct dir_context *buf, const char *name,
+                            int namelen,
 #else
-static int osd_ios_root_fill(void *buf,
+static int osd_ios_root_fill(void *buf, const char *name, int namelen,
 #endif
-                            const char *name, int namelen,
                             loff_t offset, __u64 ino, unsigned d_type)
 {
        struct osd_ios_filldir_buf *fill_buf =