LU-3534 osp: move RPC pack from declare to execution phase

[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 d59ad51..dca0776 100644 (file)
--- a/lustre/osd-ldiskfs/osd_scrub.c
+++ b/lustre/osd-ldiskfs/osd_scrub.c
@@ -1653,10 +1653,6 @@ static const struct osd_lf_map osd_lf_maps[] = {
        { "LAST_GROUP", { FID_SEQ_LOCAL_FILE, OFD_LAST_GROUP_OID, 0 },
                OLF_SHOW_NAME, sizeof("LAST_GROUP") - 1, NULL, NULL },
 
-       /* SLAVE_LOG, llog for destroy slave stripes of striped dir */
-       { "SLAVE_LOG", { FID_SEQ_LOCAL_FILE, SLAVE_LLOG_CATALOGS_OID, 0 },
-              OLF_SHOW_NAME, sizeof("SLAVE_LOG") - 1, NULL, NULL },
-
        /* lost+found */
        { "lost+found", { FID_SEQ_LOCAL_FILE, OSD_LPF_OID, 0 },
                OLF_SCAN_SUBITEMS, sizeof("lost+found") - 1,
@@ -2516,8 +2512,7 @@ void osd_scrub_cleanup(const struct lu_env *env, struct osd_device *dev)
 /* object table based iteration APIs */
 
 static struct dt_it *osd_otable_it_init(const struct lu_env *env,
-                                      struct dt_object *dt, __u32 attr,
-                                      struct lustre_capa *capa)
+                                      struct dt_object *dt, __u32 attr)
 {
        enum dt_otable_it_flags flags = attr >> DT_OTABLE_IT_FLAGS_SHIFT;
        enum dt_otable_it_valid valid = attr & ~DT_OTABLE_IT_FLAGS_MASK;