Whamcloud - gitweb
LU-1534 osd: Fix LBUGs when destroying IGIF objects
[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_oi.c
index d13a0fa..544eabc 100644 (file)
@@ -70,6 +70,7 @@
 /* osd_lookup(), struct osd_thread_info */
 #include "osd_internal.h"
 #include "osd_igif.h"
+#include "osd_scrub.h"
 
 static unsigned int osd_oi_count = OSD_OI_FID_NR;
 CFS_MODULE_PARM(osd_oi_count, "i", int, 0444,
@@ -89,22 +90,25 @@ static struct dt_index_features oi_feat = {
 #define OSD_OI_NAME_BASE        "oi.16"
 
 static void osd_oi_table_put(struct osd_thread_info *info,
-                             struct osd_oi **oi_table, unsigned oi_count)
+                            struct osd_oi **oi_table, unsigned oi_count)
 {
-        struct iam_container *bag;
-        int                   i;
-
-        for (i = 0; i < oi_count; i++) {
-                LASSERT(oi_table[i] != NULL);
-                LASSERT(oi_table[i]->oi_inode != NULL);
-
-                bag = &(oi_table[i]->oi_dir.od_container);
-                if (bag->ic_object == oi_table[i]->oi_inode)
-                        iam_container_fini(bag);
-                iput(oi_table[i]->oi_inode);
-                oi_table[i]->oi_inode = NULL;
-                OBD_FREE_PTR(oi_table[i]);
-        }
+       struct iam_container *bag;
+       int                   i;
+
+       for (i = 0; i < oi_count; i++) {
+               if (oi_table[i] == NULL)
+                       continue;
+
+               LASSERT(oi_table[i]->oi_inode != NULL);
+
+               bag = &(oi_table[i]->oi_dir.od_container);
+               if (bag->ic_object == oi_table[i]->oi_inode)
+                       iam_container_fini(bag);
+               iput(oi_table[i]->oi_inode);
+               oi_table[i]->oi_inode = NULL;
+               OBD_FREE_PTR(oi_table[i]);
+               oi_table[i] = NULL;
+       }
 }
 
 static int osd_oi_index_create_one(struct osd_thread_info *info,
@@ -281,89 +285,136 @@ out_inode:
  */
 static int
 osd_oi_table_open(struct osd_thread_info *info, struct osd_device *osd,
-                  struct osd_oi **oi_table, unsigned oi_count, bool create)
+                 struct osd_oi **oi_table, unsigned oi_count, bool create)
 {
-        struct dt_device *dev = &osd->od_dt_dev;
-        int               count = 0;
-        int               rc = 0;
-        int               i;
-
-        /* NB: oi_count != 0 means that we have already created/known all OIs
-         * and have known exact number of OIs. */
-        LASSERT(oi_count <= OSD_OI_FID_NR_MAX);
-
-        for (i = 0; i < (oi_count != 0 ? oi_count : OSD_OI_FID_NR_MAX); i++) {
-                char name[12];
-
-                sprintf(name, "%s.%d", OSD_OI_NAME_BASE, i);
-                rc = osd_oi_open(info, osd, name, &oi_table[i], create);
-                if (rc == 0) {
-                        count++;
-                        continue;
-                }
-
-                if (rc == -ENOENT && oi_count == 0)
-                        return count;
-
-                CERROR("%s: can't open %s: rc = %d\n",
-                       dev->dd_lu_dev.ld_obd->obd_name, name, rc);
-                if (oi_count > 0) {
-                        CERROR("%s: expect to open total %d OI files.\n",
-                               dev->dd_lu_dev.ld_obd->obd_name, oi_count);
-                }
-                break;
-        }
+       struct dt_device  *dev = &osd->od_dt_dev;
+       struct scrub_file *sf = &osd->od_scrub.os_file;
+       int                count = 0;
+       int                rc = 0;
+       int                i;
+       ENTRY;
+
+       /* NB: oi_count != 0 means that we have already created/known all OIs
+        * and have known exact number of OIs. */
+       LASSERT(oi_count <= OSD_OI_FID_NR_MAX);
+
+       for (i = 0; i < (oi_count != 0 ? oi_count : OSD_OI_FID_NR_MAX); i++) {
+               char name[12];
+
+               if (oi_table[i] != NULL) {
+                       count++;
+                       continue;
+               }
 
-        if (rc < 0) {
-                osd_oi_table_put(info, oi_table, count);
-                return rc;
-        }
+               sprintf(name, "%s.%d", OSD_OI_NAME_BASE, i);
+               rc = osd_oi_open(info, osd, name, &oi_table[i], create);
+               if (rc == 0) {
+                       count++;
+                       continue;
+               }
+
+               if (rc == -ENOENT && create == false) {
+                       if (oi_count == 0)
+                               return count;
+
+                       rc = 0;
+                       ldiskfs_set_bit(i, sf->sf_oi_bitmap);
+                       continue;
+               }
+
+               CERROR("%s: can't open %s: rc = %d\n",
+                      dev->dd_lu_dev.ld_obd->obd_name, name, rc);
+               if (oi_count > 0)
+                       CERROR("%s: expect to open total %d OI files.\n",
+                              dev->dd_lu_dev.ld_obd->obd_name, oi_count);
+               break;
+       }
+
+       if (rc < 0) {
+               osd_oi_table_put(info, oi_table, oi_count > 0 ? oi_count : i);
+               count = rc;
+       }
 
-        return count;
+       RETURN(count);
 }
 
 int osd_oi_init(struct osd_thread_info *info, struct osd_device *osd)
 {
-        struct dt_device *dev = &osd->od_dt_dev;
-        struct osd_oi   **oi;
-        int               rc;
+       struct dt_device  *dev = &osd->od_dt_dev;
+       struct osd_scrub  *scrub = &osd->od_scrub;
+       struct scrub_file *sf = &scrub->os_file;
+       struct osd_oi    **oi;
+       int                rc;
+       ENTRY;
+
+       OBD_ALLOC(oi, sizeof(*oi) * OSD_OI_FID_NR_MAX);
+       if (oi == NULL)
+               RETURN(-ENOMEM);
+
+       cfs_mutex_lock(&oi_init_lock);
+       /* try to open existing multiple OIs first */
+       rc = osd_oi_table_open(info, osd, oi, sf->sf_oi_count, false);
+       if (rc < 0)
+               GOTO(out, rc);
 
-        OBD_ALLOC(oi, sizeof(*oi) * OSD_OI_FID_NR_MAX);
-        if (oi == NULL)
-                return -ENOMEM;
-
-        cfs_mutex_lock(&oi_init_lock);
-        /* try to open existing multiple OIs first */
-        rc = osd_oi_table_open(info, osd, oi, 0, false);
-        if (rc != 0)
-                goto out;
-
-        /* if previous failed then try found single OI from old filesystem */
-        rc = osd_oi_open(info, osd, OSD_OI_NAME_BASE, &oi[0], false);
-        if (rc == 0) { /* found single OI from old filesystem */
-                rc = 1;
-                goto out;
-        } else if (rc != -ENOENT) {
-                CERROR("%s: can't open %s: rc = %d\n",
-                       dev->dd_lu_dev.ld_obd->obd_name, OSD_OI_NAME_BASE, rc);
-                goto out;
-        }
+       if (rc > 0) {
+               if (rc == sf->sf_oi_count || sf->sf_oi_count == 0)
+                       GOTO(out, rc);
+
+               osd_scrub_file_reset(scrub,
+                                    LDISKFS_SB(osd_sb(osd))->s_es->s_uuid,
+                                    SF_RECREATED);
+               osd_oi_count = sf->sf_oi_count;
+               goto create;
+       }
+
+       /* if previous failed then try found single OI from old filesystem */
+       rc = osd_oi_open(info, osd, OSD_OI_NAME_BASE, &oi[0], false);
+       if (rc == 0) { /* found single OI from old filesystem */
+               GOTO(out, rc = 1);
+       } else if (rc != -ENOENT) {
+               CERROR("%s: can't open %s: rc = %d\n",
+                      dev->dd_lu_dev.ld_obd->obd_name, OSD_OI_NAME_BASE, rc);
+               GOTO(out, rc);
+       }
+
+       if (sf->sf_oi_count > 0) {
+               int i;
+
+               memset(sf->sf_oi_bitmap, 0, SCRUB_OI_BITMAP_SIZE);
+               for (i = 0; i < osd_oi_count; i++)
+                       ldiskfs_set_bit(i, sf->sf_oi_bitmap);
+               osd_scrub_file_reset(scrub,
+                                    LDISKFS_SB(osd_sb(osd))->s_es->s_uuid,
+                                    SF_RECREATED);
+       }
+       sf->sf_oi_count = osd_oi_count;
+
+create:
+       rc = osd_scrub_file_store(scrub);
+       if (rc < 0) {
+               osd_oi_table_put(info, oi, sf->sf_oi_count);
+               GOTO(out, rc);
+       }
+
+       /* No OIs exist, new filesystem, create OI objects */
+       rc = osd_oi_table_open(info, osd, oi, osd_oi_count, true);
+       LASSERT(ergo(rc >= 0, rc == osd_oi_count));
+
+       GOTO(out, rc);
 
-        /* No OIs exist, new filesystem, create OI objects */
-        rc = osd_oi_table_open(info, osd, oi, osd_oi_count, true);
-        LASSERT(ergo(rc >= 0, rc == osd_oi_count));
 out:
-        if (rc < 0) {
-                OBD_FREE(oi, sizeof(*oi) * OSD_OI_FID_NR_MAX);
-        } else {
-                LASSERT((rc & (rc - 1)) == 0);
-                osd->od_oi_table = oi;
-                osd->od_oi_count = rc;
-                rc = 0;
-        }
+       if (rc < 0) {
+               OBD_FREE(oi, sizeof(*oi) * OSD_OI_FID_NR_MAX);
+       } else {
+               LASSERT((rc & (rc - 1)) == 0);
+               osd->od_oi_table = oi;
+               osd->od_oi_count = rc;
+               rc = 0;
+       }
 
-        cfs_mutex_unlock(&oi_init_lock);
-        return rc;
+       cfs_mutex_unlock(&oi_init_lock);
+       return rc;
 }
 
 void osd_oi_fini(struct osd_thread_info *info, struct osd_device *osd)
@@ -564,6 +615,9 @@ int osd_oi_delete(struct osd_thread_info *info,
 {
        struct lu_fid *oi_fid = &info->oti_fid2;
 
+       if (fid_is_igif(fid))
+               return 0;
+
        LASSERT(fid_seq(fid) != FID_SEQ_LOCAL_FILE);
 
        if (fid_is_idif(fid) || fid_seq(fid) == FID_SEQ_LLOG)