LU-9153 utils: improve llog name parsing

[fs/lustre-release.git] / lustre / obdclass / local_storage.c

diff --git a/lustre/obdclass/local_storage.c b/lustre/obdclass/local_storage.c
index aeba810..453bedc 100644 (file)
--- a/lustre/obdclass/local_storage.c
+++ b/lustre/obdclass/local_storage.c
@@ -35,7 +35,7 @@
 #include "local_storage.h"
 
 /* all initialized local storages on this node are linked on this */
-static struct list_head ls_list_head = LIST_HEAD_INIT(ls_list_head);
+static LIST_HEAD(ls_list_head);
 static DEFINE_MUTEX(ls_list_mutex);
 
 static int ls_object_init(const struct lu_env *env, struct lu_object *o,
@@ -425,6 +425,28 @@ out:
        RETURN(dto);
 }
 
+struct dt_object *local_file_find(const struct lu_env *env,
+                                 struct local_oid_storage *los,
+                                 struct dt_object *parent,
+                                 const char *name)
+{
+       struct dt_thread_info   *dti = dt_info(env);
+       struct dt_object        *dto;
+       int                      rc;
+
+       LASSERT(parent);
+
+       rc = dt_lookup_dir(env, parent, name, &dti->dti_fid);
+       if (!rc)
+               dto = ls_locate(env, dt2ls_dev(los->los_dev),
+                               &dti->dti_fid, NULL);
+       else
+               dto = ERR_PTR(rc);
+
+       return dto;
+}
+EXPORT_SYMBOL(local_file_find);
+
 /*
  * Look up and create (if it does not exist) a local named file or directory in
  * parent directory.
@@ -438,30 +460,21 @@ struct dt_object *local_file_find_or_create(const struct lu_env *env,
        struct dt_object        *dto;
        int                      rc;
 
-       LASSERT(parent);
+       dto = local_file_find(env, los, parent, name);
+       if (!IS_ERR(dto) || PTR_ERR(dto) != -ENOENT)
+               return dto;
 
-       rc = dt_lookup_dir(env, parent, name, &dti->dti_fid);
-       if (rc == 0)
-               /* name is found, get the object */
-               dto = ls_locate(env, dt2ls_dev(los->los_dev),
-                               &dti->dti_fid, NULL);
-       else if (rc != -ENOENT)
-               dto = ERR_PTR(rc);
-       else {
-               rc = local_object_fid_generate(env, los, &dti->dti_fid);
-               if (rc < 0) {
-                       dto = ERR_PTR(rc);
-               } else {
-                       /* create the object */
-                       dti->dti_attr.la_valid  = LA_MODE;
-                       dti->dti_attr.la_mode   = mode;
-                       dti->dti_dof.dof_type   = dt_mode_to_dft(mode & S_IFMT);
-                       dto = __local_file_create(env, &dti->dti_fid, los,
-                                                 dt2ls_dev(los->los_dev),
-                                                 parent, name, &dti->dti_attr,
-                                                 &dti->dti_dof);
-               }
-       }
+       rc = local_object_fid_generate(env, los, &dti->dti_fid);
+       if (rc)
+               return ERR_PTR(rc);
+
+       /* create the object */
+       dti->dti_attr.la_valid = LA_MODE;
+       dti->dti_attr.la_mode = mode;
+       dti->dti_dof.dof_type = dt_mode_to_dft(mode & S_IFMT);
+       dto = __local_file_create(env, &dti->dti_fid, los,
+                                 dt2ls_dev(los->los_dev), parent, name,
+                                 &dti->dti_attr, &dti->dti_dof);
        return dto;
 }
 EXPORT_SYMBOL(local_file_find_or_create);
@@ -731,7 +744,7 @@ static int lastid_compat_check(const struct lu_env *env, struct dt_device *dev,
                return PTR_ERR(root);
 
        /* find old last_id file */
-       snprintf(dti->dti_buf, sizeof(dti->dti_buf), "seq-"LPX64"-lastid",
+       snprintf(dti->dti_buf, sizeof(dti->dti_buf), "seq-%#llx-lastid",
                 lastid_seq);
        rc = dt_lookup_dir(env, root, dti->dti_buf, &dti->dti_fid);
        lu_object_put_nocache(env, &root->do_lu);
@@ -754,7 +767,7 @@ static int lastid_compat_check(const struct lu_env *env, struct dt_device *dev,
        } else if (rc < 0) {
                return rc;
        } else {
-               CDEBUG(D_INFO, "Found old lastid file for sequence "LPX64"\n",
+               CDEBUG(D_INFO, "Found old lastid file for sequence %#llx\n",
                       lastid_seq);
                o = ls_locate(env, ls, &dti->dti_fid, NULL);
                if (IS_ERR(o))
@@ -769,12 +782,12 @@ static int lastid_compat_check(const struct lu_env *env, struct dt_device *dev,
        rc = dt_record_read(env, o, &dti->dti_lb, &dti->dti_off);
        dt_read_unlock(env, o);
        if (rc == 0 && le32_to_cpu(losd.lso_magic) != LOS_MAGIC) {
-               CERROR("%s: wrong content of seq-"LPX64"-lastid file, magic %x\n",
+               CERROR("%s: wrong content of seq-%#llx-lastid file, magic %x\n",
                       o->do_lu.lo_dev->ld_obd->obd_name, lastid_seq,
                       le32_to_cpu(losd.lso_magic));
                rc = -EINVAL;
        } else if (rc < 0) {
-               CERROR("%s: failed to read seq-"LPX64"-lastid: rc = %d\n",
+               CERROR("%s: failed to read seq-%#llx-lastid: rc = %d\n",
                       o->do_lu.lo_dev->ld_obd->obd_name, lastid_seq, rc);
        }
        lu_object_put_nocache(env, &o->do_lu);
@@ -901,7 +914,7 @@ out_trans:
                rc = dt_record_read(env, o, &dti->dti_lb, &dti->dti_off);
                dt_read_unlock(env, o);
                if (rc == 0 && le64_to_cpu(lastid) > OBIF_MAX_OID) {
-                       CERROR("%s: bad oid "LPU64" is read from LAST_ID\n",
+                       CERROR("%s: bad oid %llu is read from LAST_ID\n",
                               o->do_lu.lo_dev->ld_obd->obd_name,
                               le64_to_cpu(lastid));
                        rc = -EINVAL;