* GPL HEADER END
*/
/*
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
*/
/*
* lustre/obdclass/local_storage.c
}
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)
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)
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);
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, 1);
if (dti->dti_dof.dof_type == DFT_DIR)
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);
} 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))
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);
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;