LU-3335 scrub: OI scrub on OST

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_oi.c

diff --git a/lustre/osd-ldiskfs/osd_oi.c b/lustre/osd-ldiskfs/osd_oi.c
index 9194672..230f015 100644 (file)
--- a/lustre/osd-ldiskfs/osd_oi.c
+++ b/lustre/osd-ldiskfs/osd_oi.c
@@ -229,6 +229,13 @@ static int osd_oi_open(struct osd_thread_info *info, struct osd_device *osd,
                 RETURN(PTR_ERR(inode));
 
        ldiskfs_set_inode_state(inode, LDISKFS_STATE_LUSTRE_NO_OI);
+       /* 'What the @fid is' is not imporatant, because these objects
+        * have no OI mappings, and only are visible inside the OSD.*/
+       lu_igif_build(&info->oti_fid, inode->i_ino, inode->i_generation);
+       rc = osd_ea_fid_set(info, inode, &info->oti_fid, LMAC_NOT_IN_OI, 0);
+       if (rc != 0)
+               GOTO(out_inode, rc);
+
         OBD_ALLOC_PTR(oi);
         if (oi == NULL)
                 GOTO(out_inode, rc = -ENOMEM);
@@ -461,12 +468,15 @@ static int osd_oi_iam_lookup(struct osd_thread_info *oti,
 }
 
 int fid_is_on_ost(struct osd_thread_info *info, struct osd_device *osd,
-                 const struct lu_fid *fid)
+                 const struct lu_fid *fid, enum oi_check_flags flags)
 {
        struct lu_seq_range *range = &info->oti_seq_range;
        int rc;
        ENTRY;
 
+       if (flags & OI_KNOWN_ON_OST)
+               RETURN(1);
+
        if (unlikely(fid_is_local_file(fid) || fid_is_igif(fid) ||
                     fid_is_llog(fid)))
                RETURN(0);
@@ -474,6 +484,9 @@ int fid_is_on_ost(struct osd_thread_info *info, struct osd_device *osd,
        if (fid_is_idif(fid) || fid_is_last_id(fid))
                RETURN(1);
 
+       if (!(flags & OI_CHECK_FLD))
+               RETURN(0);
+
        rc = osd_fld_lookup(info->oti_env, osd, fid, range);
        if (rc != 0) {
                CERROR("%s: Can not lookup fld for "DFID"\n",
@@ -490,8 +503,8 @@ int fid_is_on_ost(struct osd_thread_info *info, struct osd_device *osd,
        RETURN(0);
 }
 
-int __osd_oi_lookup(struct osd_thread_info *info, struct osd_device *osd,
-                   const struct lu_fid *fid, struct osd_inode_id *id)
+static int __osd_oi_lookup(struct osd_thread_info *info, struct osd_device *osd,
+                          const struct lu_fid *fid, struct osd_inode_id *id)
 {
        struct lu_fid *oi_fid = &info->oti_fid2;
        int            rc;
@@ -510,12 +523,12 @@ int __osd_oi_lookup(struct osd_thread_info *info, struct osd_device *osd,
 
 int osd_oi_lookup(struct osd_thread_info *info, struct osd_device *osd,
                  const struct lu_fid *fid, struct osd_inode_id *id,
-                 bool check_fld)
+                 enum oi_check_flags flags)
 {
        if (unlikely(fid_is_last_id(fid)))
                return osd_obj_spec_lookup(info, osd, fid, id);
 
-       if ((check_fld && fid_is_on_ost(info, osd, fid)) || fid_is_llog(fid))
+       if (fid_is_on_ost(info, osd, fid, flags) || fid_is_llog(fid))
                return osd_obj_map_lookup(info, osd, fid, id);
 
        if (fid_is_fs_root(fid)) {
@@ -570,7 +583,7 @@ static int osd_oi_iam_refresh(struct osd_thread_info *oti, struct osd_oi *oi,
 
 int osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd,
                  const struct lu_fid *fid, const struct osd_inode_id *id,
-                 struct thandle *th)
+                 struct thandle *th, enum oi_check_flags flags)
 {
        struct lu_fid       *oi_fid = &info->oti_fid2;
        struct osd_inode_id *oi_id  = &info->oti_id2;
@@ -579,7 +592,7 @@ int osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd,
        if (unlikely(fid_is_last_id(fid)))
                return osd_obj_spec_insert(info, osd, fid, id, th);
 
-       if (fid_is_on_ost(info, osd, fid) || fid_is_llog(fid))
+       if (fid_is_on_ost(info, osd, fid, flags) || fid_is_llog(fid))
                return osd_obj_map_insert(info, osd, fid, id, th);
 
        fid_cpu_to_be(oi_fid, fid);
@@ -594,16 +607,12 @@ int osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd,
                if (rc != -EEXIST)
                        return rc;
 
-               rc = osd_oi_lookup(info, osd, fid, oi_id, false);
-               if (unlikely(rc != 0))
+               rc = osd_oi_lookup(info, osd, fid, oi_id, 0);
+               if (rc != 0)
                        return rc;
 
-               if (osd_id_eq(id, oi_id)) {
-                       CERROR("%.16s: the FID "DFID" is there already:%u/%u\n",
-                              LDISKFS_SB(osd_sb(osd))->s_es->s_volume_name,
-                              PFID(fid), id->oii_ino, id->oii_gen);
-                       return -EEXIST;
-               }
+               if (unlikely(osd_id_eq(id, oi_id)))
+                       return 0;
 
                /* Check whether the mapping for oi_id is valid or not. */
                inode = osd_iget(info, osd, oi_id);
@@ -622,7 +631,8 @@ int osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd,
                if (rc != 0)
                        return rc;
 
-               if (lu_fid_eq(fid, &lma->lma_self_fid)) {
+               if (!(lma->lma_compat & LMAC_NOT_IN_OI) &&
+                   lu_fid_eq(fid, &lma->lma_self_fid)) {
                        CERROR("%.16s: the FID "DFID" is used by two objects: "
                               "%u/%u %u/%u\n",
                               LDISKFS_SB(osd_sb(osd))->s_es->s_volume_name,
@@ -675,7 +685,7 @@ static int osd_oi_iam_delete(struct osd_thread_info *oti, struct osd_oi *oi,
 
 int osd_oi_delete(struct osd_thread_info *info,
                  struct osd_device *osd, const struct lu_fid *fid,
-                 struct thandle *th)
+                 struct thandle *th, enum oi_check_flags flags)
 {
        struct lu_fid *oi_fid = &info->oti_fid2;
 
@@ -686,7 +696,7 @@ int osd_oi_delete(struct osd_thread_info *info,
        if (fid_is_last_id(fid))
                return 0;
 
-       if (fid_is_on_ost(info, osd, fid) || fid_is_llog(fid))
+       if (fid_is_on_ost(info, osd, fid, flags) || fid_is_llog(fid))
                return osd_obj_map_delete(info, osd, fid, th);
 
        fid_cpu_to_be(oi_fid, fid);
@@ -694,6 +704,33 @@ int osd_oi_delete(struct osd_thread_info *info,
                                 (const struct dt_key *)oi_fid, th);
 }
 
+int osd_oi_update(struct osd_thread_info *info, struct osd_device *osd,
+                 const struct lu_fid *fid, const struct osd_inode_id *id,
+                 struct thandle *th, enum oi_check_flags flags)
+{
+       struct lu_fid       *oi_fid = &info->oti_fid2;
+       struct osd_inode_id *oi_id  = &info->oti_id2;
+       int                  rc     = 0;
+
+       if (unlikely(fid_is_last_id(fid)))
+               return osd_obj_spec_update(info, osd, fid, id, th);
+
+       if (fid_is_on_ost(info, osd, fid, flags) || fid_is_llog(fid))
+               return osd_obj_map_update(info, osd, fid, id, th);
+
+       fid_cpu_to_be(oi_fid, fid);
+       osd_id_pack(oi_id, id);
+       rc = osd_oi_iam_refresh(info, osd_fid2oi(osd, fid),
+                              (const struct dt_rec *)oi_id,
+                              (const struct dt_key *)oi_fid, th, false);
+       if (rc != 0)
+               return rc;
+
+       if (unlikely(fid_seq(fid) == FID_SEQ_LOCAL_FILE))
+               rc = osd_obj_spec_update(info, osd, fid, id, th);
+       return rc;
+}
+
 int osd_oi_mod_init(void)
 {
         if (osd_oi_count == 0 || osd_oi_count > OSD_OI_FID_NR_MAX)