#include "local_storage.h"
/* all initialized local storages on this node are linked on this */
-static CFS_LIST_HEAD(ls_list_head);
+static struct list_head ls_list_head = LIST_HEAD_INIT(ls_list_head);
static DEFINE_MUTEX(ls_list_mutex);
static int ls_object_init(const struct lu_env *env, struct lu_object *o,
{
struct ls_device *ls, *ret = NULL;
- cfs_list_for_each_entry(ls, &ls_list_head, ls_linkage) {
+ list_for_each_entry(ls, &ls_list_head, ls_linkage) {
if (ls->ls_osd == dev) {
atomic_inc(&ls->ls_refcount);
ret = ls;
GOTO(out_ls, ls = ERR_PTR(-ENOMEM));
atomic_set(&ls->ls_refcount, 1);
- CFS_INIT_LIST_HEAD(&ls->ls_los_list);
+ INIT_LIST_HEAD(&ls->ls_los_list);
mutex_init(&ls->ls_los_mutex);
ls->ls_osd = dev;
ls->ls_top_dev.dd_lu_dev.ld_site = dev->dd_lu_dev.ld_site;
/* finally add ls to the list */
- cfs_list_add(&ls->ls_linkage, &ls_list_head);
+ list_add(&ls->ls_linkage, &ls_list_head);
out_ls:
mutex_unlock(&ls_list_mutex);
RETURN(ls);
mutex_lock(&ls_list_mutex);
if (atomic_read(&ls->ls_refcount) == 0) {
- LASSERT(cfs_list_empty(&ls->ls_los_list));
- cfs_list_del(&ls->ls_linkage);
+ LASSERT(list_empty(&ls->ls_los_list));
+ list_del(&ls->ls_linkage);
lu_site_purge(env, ls->ls_top_dev.dd_lu_dev.ld_site, ~0);
lu_device_fini(&ls->ls_top_dev.dd_lu_dev);
OBD_FREE_PTR(ls);
{
struct dt_thread_info *dti = dt_info(env);
struct lu_object_conf *conf = &dti->dti_conf;
+ struct dt_insert_rec *rec = &dti->dti_dt_rec;
struct dt_object *dto;
struct thandle *th;
int rc;
dt_declare_ref_add(env, parent, th);
}
- rc = dt_declare_insert(env, parent, (void *)fid, (void *)name, th);
+ rec->rec_fid = fid;
+ rec->rec_type = dto->do_lu.lo_header->loh_attr;
+ 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(destroy, rc = -ENOTDIR);
+
+ rec->rec_type = S_IFDIR;
+ rec->rec_fid = fid;
/* Add "." and ".." for newly created dir */
- rc = dt_insert(env, dto, (void *)fid, (void *)".", th,
- BYPASS_CAPA, 1);
- if (rc)
+ rc = dt_insert(env, dto, (const struct dt_rec *)rec,
+ (const struct dt_key *)".", th, BYPASS_CAPA, 1);
+ if (rc != 0)
GOTO(destroy, rc);
+
dt_ref_add(env, dto, th);
- rc = dt_insert(env, dto, (void *)lu_object_fid(&parent->do_lu),
- (void *)"..", th, BYPASS_CAPA, 1);
- if (rc)
+ 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);
+ 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);
- rc = dt_insert(env, parent, (const struct dt_rec *)fid,
+ rc = dt_insert(env, parent, (const struct dt_rec *)rec,
(const struct dt_key *)name, th, BYPASS_CAPA, 1);
if (dti->dti_dof.dof_type == DFT_DIR)
dt_ref_add(env, parent, th);
rc = dt_ref_del(env, dto, th);
if (rc < 0) {
- rc = dt_insert(env, parent,
- (const struct dt_rec *)&dti->dti_fid,
+ struct dt_insert_rec *rec = &dti->dti_dt_rec;
+
+ 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);
GOTO(unlock, rc);
}
{
struct local_oid_storage *los, *ret = NULL;
- cfs_list_for_each_entry(los, &ls->ls_los_list, los_list) {
+ list_for_each_entry(los, &ls->ls_los_list, los_list) {
if (los->los_seq == seq) {
atomic_inc(&los->los_refcount);
ret = los;
mutex_init(&(*los)->los_id_lock);
(*los)->los_dev = &ls->ls_top_dev;
atomic_inc(&ls->ls_refcount);
- cfs_list_add(&(*los)->los_list, &ls->ls_los_list);
+ list_add(&(*los)->los_list, &ls->ls_los_list);
/* Use {seq, 0, 0} to create the LAST_ID file for every
* sequence. OIDs start at LUSTRE_FID_INIT_OID.
}
out_los:
if (rc != 0) {
- cfs_list_del(&(*los)->los_list);
+ list_del(&(*los)->los_list);
atomic_dec(&ls->ls_refcount);
OBD_FREE_PTR(*los);
*los = NULL;
if (los->los_obj)
lu_object_put_nocache(env, &los->los_obj->do_lu);
- cfs_list_del(&los->los_list);
+ list_del(&los->los_list);
OBD_FREE_PTR(los);
mutex_unlock(&ls->ls_los_mutex);
ls_device_put(env, ls);