LU-957 lfsck: LFSCK main engine

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

diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
index eced8db..8e4c862 100644 (file)
--- a/lustre/osd-ldiskfs/osd_handler.c
+++ b/lustre/osd-ldiskfs/osd_handler.c
@@ -90,6 +90,7 @@ static const char remote_obj_dir[] = "REM_OBJ_DIR";
 static const struct lu_object_operations      osd_lu_obj_ops;
 static const struct dt_object_operations      osd_obj_ops;
 static const struct dt_object_operations      osd_obj_ea_ops;
+static const struct dt_object_operations      osd_obj_otable_it_ops;
 static const struct dt_index_operations       osd_index_iam_ops;
 static const struct dt_index_operations       osd_index_ea_ops;
 
@@ -300,8 +301,8 @@ struct inode *osd_iget(struct osd_thread_info *info, struct osd_device *dev,
                iput(inode);
                inode = ERR_PTR(-ESTALE);
        } else if (is_bad_inode(inode)) {
-               CWARN("%s: bad inode: ino = %u\n",
-               dev->od_dt_dev.dd_lu_dev.ld_obd->obd_name, id->oii_ino);
+               CWARN("%.16s: bad inode: ino = %u\n",
+               LDISKFS_SB(osd_sb(dev))->s_es->s_volume_name, id->oii_ino);
                iput(inode);
                inode = ERR_PTR(-ENOENT);
        } else {
@@ -462,9 +463,10 @@ trigger:
                                result = -EINPROGRESS;
                        } else if (!scrub->os_no_scrub) {
                                result = osd_scrub_start(dev);
-                               LCONSOLE_ERROR("Trigger OI scrub by RPC for "
-                                              DFID", rc = %d\n",
-                                              PFID(fid), result);
+                               LCONSOLE_ERROR("%.16s: trigger OI scrub by RPC "
+                                              "for "DFID", rc = %d [1]\n",
+                                              LDISKFS_SB(osd_sb(dev))->s_es->\
+                                              s_volume_name,PFID(fid), result);
                                if (result == 0 || result == -EALREADY)
                                        result = -EINPROGRESS;
                                else
@@ -523,13 +525,18 @@ static int osd_object_init(const struct lu_env *env, struct lu_object *l,
        LINVRNT(osd_invariant(obj));
 
        result = osd_fid_lookup(env, obj, lu_object_fid(l), conf);
-        obj->oo_dt.do_body_ops = &osd_body_ops_new;
-        if (result == 0) {
-                if (obj->oo_inode != NULL)
-                        osd_object_init0(obj);
-        }
-        LINVRNT(osd_invariant(obj));
-        return result;
+       obj->oo_dt.do_body_ops = &osd_body_ops_new;
+       if (result == 0) {
+               if (obj->oo_inode != NULL) {
+                       osd_object_init0(obj);
+               } else if (fid_is_otable_it(&l->lo_header->loh_fid)) {
+                       obj->oo_dt.do_ops = &osd_obj_otable_it_ops;
+                       /* LFSCK iterator object is special without inode */
+                       l->lo_header->loh_attr |= LOHA_EXISTS;
+               }
+       }
+       LINVRNT(osd_invariant(obj));
+       return result;
 }
 
 /*
@@ -763,9 +770,10 @@ int osd_trans_start(const struct lu_env *env, struct dt_device *d,
                 GOTO(out, rc);
 
         if (!osd_param_is_sane(dev, th)) {
-                CWARN("%s: too many transaction credits (%d > %d)\n",
-                      d->dd_lu_dev.ld_obd->obd_name, oh->ot_credits,
-                      osd_journal(dev)->j_max_transaction_buffers);
+               CWARN("%.16s: too many transaction credits (%d > %d)\n",
+                     LDISKFS_SB(osd_sb(dev))->s_es->s_volume_name,
+                     oh->ot_credits,
+                     osd_journal(dev)->j_max_transaction_buffers);
                 /* XXX Limit the credits to 'max_transaction_buffers', and
                  *     let the underlying filesystem to catch the error if
                  *     we really need so many credits.
@@ -2756,6 +2764,15 @@ static int osd_index_try(const struct lu_env *env, struct dt_object *dt,
         return result;
 }
 
+static int osd_otable_it_attr_get(const struct lu_env *env,
+                                struct dt_object *dt,
+                                struct lu_attr *attr,
+                                struct lustre_capa *capa)
+{
+       attr->la_valid = 0;
+       return 0;
+}
+
 static const struct dt_object_operations osd_obj_ops = {
         .do_read_lock         = osd_object_read_lock,
         .do_write_lock        = osd_object_write_lock,
@@ -2820,6 +2837,11 @@ static const struct dt_object_operations osd_obj_ea_ops = {
         .do_data_get          = osd_data_get,
 };
 
+static const struct dt_object_operations osd_obj_otable_it_ops = {
+       .do_attr_get    = osd_otable_it_attr_get,
+       .do_index_try   = osd_index_try,
+};
+
 static int osd_index_declare_iam_delete(const struct lu_env *env,
                                         struct dt_object *dt,
                                         const struct dt_key *key,
@@ -3323,8 +3345,10 @@ again:
                CDEBUG(D_LFSCK, "Trigger OI scrub by RPC for "DFID"\n",
                       PFID(fid));
                rc = osd_scrub_start(dev);
-               CDEBUG(D_LFSCK, "Trigger OI scrub by RPC for "DFID", rc = %d\n",
-                      PFID(fid), rc);
+               LCONSOLE_ERROR("%.16s: trigger OI scrub by RPC for "DFID
+                              ", rc = %d [2]\n",
+                              LDISKFS_SB(osd_sb(dev))->s_es->s_volume_name,
+                              PFID(fid), rc);
                if (rc == 0)
                        goto again;
        }