LU-6245 client: remove types abstraction from client code

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

diff --git a/lustre/obdclass/local_storage.c b/lustre/obdclass/local_storage.c
index 2cc4afe..ffcf104 100644 (file)
--- a/lustre/obdclass/local_storage.c
+++ b/lustre/obdclass/local_storage.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * lustre/obdclass/local_storage.c
@@ -339,17 +339,39 @@ static struct dt_object *__local_file_create(const struct lu_env *env,
        }
 
        rec->rec_fid = fid;
-       rec->rec_type = dto->do_lu.lo_header->loh_attr;
+       rec->rec_type = attr->la_mode & S_IFMT;
        rc = dt_declare_insert(env, parent, (const struct dt_rec *)rec,
                               (const struct dt_key *)name, th);
        if (rc)
                GOTO(trans_stop, rc);
 
+       if (dti->dti_dof.dof_type == DFT_DIR) {
+               if (!dt_try_as_dir(env, dto))
+                       GOTO(trans_stop, rc = -ENOTDIR);
+
+               rec->rec_type = S_IFDIR;
+               rec->rec_fid = fid;
+               rc = dt_declare_insert(env, dto, (const struct dt_rec *)rec,
+                               (const struct dt_key *)".", th);
+               if (rc != 0)
+                       GOTO(trans_stop, rc);
+
+               rec->rec_fid = lu_object_fid(&parent->do_lu);
+               rc = dt_declare_insert(env, dto, (const struct dt_rec *)rec,
+                               (const struct dt_key *)"..", th);
+               if (rc != 0)
+                       GOTO(trans_stop, rc);
+
+               rc = dt_declare_ref_add(env, dto, th);
+               if (rc != 0)
+                       GOTO(trans_stop, rc);
+       }
+
        rc = dt_trans_start_local(env, ls->ls_osd, th);
        if (rc)
                GOTO(trans_stop, rc);
 
-       dt_write_lock(env, dto, 0);
+       dt_write_lock(env, dto, LOS_CHILD);
        if (dt_object_exists(dto))
                GOTO(unlock, rc = 0);
 
@@ -361,30 +383,28 @@ static struct dt_object *__local_file_create(const struct lu_env *env,
        LASSERT(dt_object_exists(dto));
 
        if (dti->dti_dof.dof_type == DFT_DIR) {
-               if (!dt_try_as_dir(env, dto))
-                       GOTO(destroy, rc = -ENOTDIR);
 
                rec->rec_type = S_IFDIR;
                rec->rec_fid = fid;
                /* Add "." and ".." for newly created dir */
                rc = dt_insert(env, dto, (const struct dt_rec *)rec,
-                              (const struct dt_key *)".", th, BYPASS_CAPA, 1);
+                              (const struct dt_key *)".", th, 1);
                if (rc != 0)
                        GOTO(destroy, rc);
 
                dt_ref_add(env, dto, th);
                rec->rec_fid = lu_object_fid(&parent->do_lu);
                rc = dt_insert(env, dto, (const struct dt_rec *)rec,
-                              (const struct dt_key *)"..", th, BYPASS_CAPA, 1);
+                              (const struct dt_key *)"..", th, 1);
                if (rc != 0)
                        GOTO(destroy, rc);
        }
 
        rec->rec_fid = fid;
        rec->rec_type = dto->do_lu.lo_header->loh_attr;
-       dt_write_lock(env, parent, 0);
+       dt_write_lock(env, parent, LOS_PARENT);
        rc = dt_insert(env, parent, (const struct dt_rec *)rec,
-                      (const struct dt_key *)name, th, BYPASS_CAPA, 1);
+                      (const struct dt_key *)name, th, 1);
        if (dti->dti_dof.dof_type == DFT_DIR)
                dt_ref_add(env, parent, th);
        dt_write_unlock(env, parent);
@@ -640,7 +660,7 @@ int local_object_unlink(const struct lu_env *env, struct dt_device *dt,
                GOTO(stop, rc);
 
        dt_write_lock(env, dto, 0);
-       rc = dt_delete(env, parent, (struct dt_key *)name, th, BYPASS_CAPA);
+       rc = dt_delete(env, parent, (struct dt_key *)name, th);
        if (rc < 0)
                GOTO(unlock, rc);
 
@@ -651,7 +671,7 @@ int local_object_unlink(const struct lu_env *env, struct dt_device *dt,
                rec->rec_fid = &dti->dti_fid;
                rec->rec_type = dto->do_lu.lo_header->loh_attr;
                rc = dt_insert(env, parent, (const struct dt_rec *)rec,
-                              (const struct dt_key *)name, th, BYPASS_CAPA, 1);
+                              (const struct dt_key *)name, th, 1);
                GOTO(unlock, rc);
        }
 
@@ -711,7 +731,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);
@@ -734,7 +754,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))
@@ -749,12 +769,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);
@@ -881,7 +901,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;