LU-3336 lfsck: namespace visible lost+found 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 3c02805..9228d00 100644 (file)
--- a/lustre/osd-ldiskfs/osd_scrub.c
+++ b/lustre/osd-ldiskfs/osd_scrub.c
@@ -808,36 +808,31 @@ static int osd_scrub_get_fid(struct osd_thread_info *info,
        rc = osd_get_lma(info, inode, &info->oti_obj_dentry, lma);
        if (rc == 0) {
                has_lma = true;
-               if (lma->lma_compat & LMAC_NOT_IN_OI) {
-                       ldiskfs_set_inode_state(inode,
-                                               LDISKFS_STATE_LUSTRE_NO_OI);
+               if (lma->lma_compat & LMAC_NOT_IN_OI ||
+                   lma->lma_incompat & LMAI_AGENT)
                        return SCRUB_NEXT_CONTINUE;
-               }
 
                *fid = lma->lma_self_fid;
-               if (fid_is_internal(&lma->lma_self_fid)) {
-                       if (!scrub)
-                               rc = SCRUB_NEXT_CONTINUE;
-                       return rc;
-               }
-
                if (!scrub)
                        return 0;
 
-               if (fid_is_namespace_visible(fid) && !fid_is_norm(fid))
-                       return 0;
-
                if (lma->lma_compat & LMAC_FID_ON_OST)
                        return SCRUB_NEXT_OSTOBJ;
 
-               if (fid_is_idif(fid) || fid_is_last_id(fid))
+               if (fid_is_idif(fid))
                        return SCRUB_NEXT_OSTOBJ_OLD;
 
-               if (lma->lma_incompat & LMAI_AGENT)
-                       return SCRUB_NEXT_CONTINUE;
+               /* For local object. */
+               if (fid_is_internal(fid))
+                       return 0;
 
-               /* Here, it may be MDT-object, or may be 2.4 OST-object.
-                * Fall through. */
+               /* For external visible MDT-object with non-normal FID. */
+               if (fid_is_namespace_visible(fid) && !fid_is_norm(fid))
+                       return 0;
+
+               /* For the object with normal FID, it may be MDT-object,
+                * or may be 2.4 OST-object, need further distinguish.
+                * Fall through to next section. */
        }
 
        if (rc == -ENODATA || rc == 0) {
@@ -911,11 +906,6 @@ static int osd_iit_iget(struct osd_thread_info *info, struct osd_device *dev,
                RETURN(rc);
        }
 
-       /* If the inode has no OI mapping, then it is special locally used,
-        * should be invisible to OI scrub or up layer LFSCK. */
-       if (ldiskfs_test_inode_state(inode, LDISKFS_STATE_LUSTRE_NO_OI))
-               GOTO(put, rc = SCRUB_NEXT_CONTINUE);
-
        if (scrub &&
            ldiskfs_test_inode_state(inode, LDISKFS_STATE_LUSTRE_NOSCRUB)) {
                /* Only skip it for the first OI scrub accessing. */
@@ -1309,6 +1299,8 @@ static int osd_ios_varfid_fill(void *buf, const char *name, int namelen,
                               loff_t offset, __u64 ino, unsigned d_type);
 static int osd_ios_lf_fill(void *buf, const char *name, int namelen,
                           loff_t offset, __u64 ino, unsigned d_type);
+static int osd_ios_dl_fill(void *buf, const char *name, int namelen,
+                          loff_t offset, __u64 ino, unsigned d_type);
 
 static int
 osd_ios_general_scan(struct osd_thread_info *info, struct osd_device *dev,
@@ -1419,6 +1411,10 @@ static const struct osd_lf_map osd_lf_maps[] = {
        { "LAST_GROUP", { FID_SEQ_LOCAL_FILE, OFD_LAST_GROUP_OID, 0 },
                OLF_SHOW_NAME, 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, NULL, NULL },
+
        /* lost+found */
        { "lost+found", { 0, 0, 0 }, OLF_SCAN_SUBITEMS | OLF_NO_OI,
                osd_ios_general_scan, osd_ios_lf_fill },
@@ -1426,6 +1422,19 @@ static const struct osd_lf_map osd_lf_maps[] = {
        { NULL, { 0, 0, 0 }, 0, NULL, NULL }
 };
 
+/* Add the new introduced files under .lustre/ in the list in the future. */
+static const struct osd_lf_map osd_dl_maps[] = {
+       /* .lustre/fid */
+       { "fid", { FID_SEQ_DOT_LUSTRE, FID_OID_DOT_LUSTRE_OBF, 0 }, 0,
+               NULL, NULL },
+
+       /* .lustre/lost+found */
+       { "lost+found", { FID_SEQ_DOT_LUSTRE, FID_OID_DOT_LUSTRE_LPF, 0 }, 0,
+               NULL, NULL },
+
+       { NULL, { 0, 0, 0 }, 0, NULL, NULL }
+};
+
 struct osd_ios_item {
        cfs_list_t       oii_list;
        struct dentry   *oii_dentry;
@@ -1649,6 +1658,42 @@ static int osd_ios_varfid_fill(void *buf, const char *name, int namelen,
        RETURN(rc);
 }
 
+static int osd_ios_dl_fill(void *buf, const char *name, int namelen,
+                          loff_t offset, __u64 ino, unsigned d_type)
+{
+       struct osd_ios_filldir_buf *fill_buf = buf;
+       struct osd_device          *dev      = fill_buf->oifb_dev;
+       const struct osd_lf_map    *map;
+       struct dentry              *child;
+       int                         rc       = 0;
+       ENTRY;
+
+       /* skip any '.' started names */
+       if (name[0] == '.')
+               RETURN(0);
+
+       for (map = osd_dl_maps; map->olm_name != NULL; map++) {
+               if (strlen(map->olm_name) != namelen)
+                       continue;
+
+               if (strncmp(map->olm_name, name, namelen) == 0)
+                       break;
+       }
+
+       if (map->olm_name == NULL)
+               RETURN(0);
+
+       child = osd_ios_lookup_one_len(name, fill_buf->oifb_dentry, namelen);
+       if (IS_ERR(child))
+               RETURN(PTR_ERR(child));
+
+       rc = osd_ios_scan_one(fill_buf->oifb_info, dev, child->d_inode,
+                             &map->olm_fid, map->olm_flags);
+       dput(child);
+
+       RETURN(rc);
+}
+
 static int osd_ios_root_fill(void *buf, const char *name, int namelen,
                             loff_t offset, __u64 ino, unsigned d_type)
 {
@@ -1782,6 +1827,9 @@ osd_ios_ROOT_scan(struct osd_thread_info *info, struct osd_device *dev,
                 * to the solution 2). */
                rc = osd_ios_scan_one(info, dev, child->d_inode,
                                      &LU_DOT_LUSTRE_FID, 0);
+               if (rc == 0)
+                       rc = osd_ios_new_item(dev, child, osd_ios_general_scan,
+                                             osd_ios_dl_fill);
                dput(child);
        }
 
@@ -2049,7 +2097,6 @@ int osd_scrub_setup(const struct lu_env *env, struct osd_device *dev)
        }
 
        inode = filp->f_dentry->d_inode;
-       ldiskfs_set_inode_state(inode, LDISKFS_STATE_LUSTRE_NO_OI);
        /* 'What the @fid is' is not imporatant, because the object
         * has no OI mapping, and only is visible inside the OSD.*/
        lu_igif_build(fid, inode->i_ino, inode->i_generation);