LU-6050 target: control OST-index in IDIF via ROCOMPAT flag

[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 411f69b..a92db02 100644 (file)
--- a/lustre/osd-ldiskfs/osd_scrub.c
+++ b/lustre/osd-ldiskfs/osd_scrub.c
@@ -370,6 +370,7 @@ osd_scrub_convert_ff(struct osd_thread_info *info, struct osd_device *dev,
 {
        struct filter_fid_old   *ff      = &info->oti_ff;
        struct dentry           *dentry  = &info->oti_obj_dentry;
 {
        struct filter_fid_old   *ff      = &info->oti_ff;
        struct dentry           *dentry  = &info->oti_obj_dentry;

+       struct lu_fid           *tfid    = &info->oti_fid;

        handle_t                *jh;
        int                      size    = 0;
        int                      rc;
        handle_t                *jh;
        int                      size    = 0;
        int                      rc;


@@ -380,6 +381,15 @@ osd_scrub_convert_ff(struct osd_thread_info *info, struct osd_device *dev,
        if (dev->od_scrub.os_file.sf_param & SP_DRYRUN)
                RETURN(0);
 
        if (dev->od_scrub.os_file.sf_param & SP_DRYRUN)
                RETURN(0);
 

+       if (fid_is_idif(fid) && dev->od_index_in_idif == 0) {
+               struct ost_id *oi = &info->oti_ostid;
+
+               fid_to_ostid(fid, oi);
+               ostid_to_fid(tfid, oi, 0);
+       } else {
+               *tfid = *fid;
+       }
+

        /* We want the LMA to fit into the 256-byte OST inode, so operate
         * as following:
         * 1) read old XATTR_NAME_FID and save the parent FID;
        /* We want the LMA to fit into the 256-byte OST inode, so operate
         * as following:
         * 1) read old XATTR_NAME_FID and save the parent FID;


@@ -395,7 +405,7 @@ osd_scrub_convert_ff(struct osd_thread_info *info, struct osd_device *dev,
        if (IS_ERR(jh)) {
                rc = PTR_ERR(jh);
                CDEBUG(D_LFSCK, "%s: fail to start trans for convert ff "
        if (IS_ERR(jh)) {
                rc = PTR_ERR(jh);
                CDEBUG(D_LFSCK, "%s: fail to start trans for convert ff "

-                      DFID": rc = %d\n", osd_name(dev), PFID(fid), rc);
+                      DFID": rc = %d\n", osd_name(dev), PFID(tfid), rc);

                RETURN(rc);
        }
 
                RETURN(rc);
        }
 


@@ -416,7 +426,7 @@ osd_scrub_convert_ff(struct osd_thread_info *info, struct osd_device *dev,
        }
 
        /* 3) make new LMA and add it */
        }
 
        /* 3) make new LMA and add it */

-       rc = osd_ea_fid_set(info, inode, fid, LMAC_FID_ON_OST, 0);
+       rc = osd_ea_fid_set(info, inode, tfid, LMAC_FID_ON_OST, 0);

        if (rc == 0 && reset)
                size = sizeof(struct filter_fid);
        else if (rc != 0 && removed)
        if (rc == 0 && reset)
                size = sizeof(struct filter_fid);
        else if (rc != 0 && removed)


@@ -439,7 +449,7 @@ stop:
        ldiskfs_journal_stop(jh);
        if (rc < 0)
                CDEBUG(D_LFSCK, "%s: fail to convert ff "DFID": rc = %d\n",
        ldiskfs_journal_stop(jh);
        if (rc < 0)
                CDEBUG(D_LFSCK, "%s: fail to convert ff "DFID": rc = %d\n",

-                      osd_name(dev), PFID(fid), rc);
+                      osd_name(dev), PFID(tfid), rc);

        return rc;
 }
 
        return rc;
 }