* GPL HEADER END
*/
/*
- * Copyright (c) 2012, 2015, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
*/
/*
* lustre/obdclass/local_storage.c
#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,
ENTRY;
- ls = container_of0(o->lo_dev, struct ls_device, ls_top_dev.dd_lu_dev);
+ ls = container_of(o->lo_dev, struct ls_device, ls_top_dev.dd_lu_dev);
under = &ls->ls_osd->dd_lu_dev;
below = under->ld_ops->ldo_object_alloc(env, o->lo_header, under);
if (below == NULL)
dt_object_fini(&obj->ls_obj);
lu_object_header_fini(h);
- OBD_FREE_PTR(obj);
+ OBD_FREE_PRE(obj, sizeof(*obj), "kfreed");
+ kfree_rcu(obj, ls_header.loh_rcu);
}
-static struct lu_object_operations ls_lu_obj_ops = {
+static const struct lu_object_operations ls_lu_obj_ops = {
.loo_object_init = ls_object_init,
.loo_object_free = ls_object_free,
};
}
}
-static struct lu_device_operations ls_lu_dev_ops = {
+static const struct lu_device_operations ls_lu_dev_ops = {
.ldo_object_alloc = ls_object_alloc
};
return ls;
}
-static struct lu_device_type_operations ls_device_type_ops = {
+static const struct lu_device_type_operations ls_device_type_ops = {
.ldto_start = NULL,
.ldto_stop = NULL,
};
if (rc)
GOTO(trans_stop, rc);
- dt_write_lock(env, dto, LOS_CHILD);
+ dt_write_lock(env, dto, DT_SRC_CHILD);
if (dt_object_exists(dto))
GOTO(unlock, rc = 0);
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, 1);
+ (const struct dt_key *)".", th);
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, 1);
+ (const struct dt_key *)"..", th);
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, LOS_PARENT);
+ dt_write_lock(env, parent, DT_SRC_PARENT);
rc = dt_insert(env, parent, (const struct dt_rec *)rec,
- (const struct dt_key *)name, th, 1);
+ (const struct dt_key *)name, th);
if (dti->dti_dof.dof_type == DFT_DIR)
dt_ref_add(env, parent, th);
dt_write_unlock(env, parent);
dt_trans_stop(env, ls->ls_osd, th);
out:
if (rc) {
- lu_object_put_nocache(env, &dto->do_lu);
+ dt_object_put_nocache(env, dto);
dto = ERR_PTR(rc);
}
RETURN(dto);
ls = ls_device_get(dt);
if (IS_ERR(ls)) {
- dto = ERR_PTR(PTR_ERR(ls));
+ dto = ERR_CAST(ls);
} else {
/* create the object */
dti->dti_attr.la_valid = LA_MODE;
* have to open the object in other device stack */
if (!IS_ERR(dto)) {
dti->dti_fid = dto->do_lu.lo_header->loh_fid;
- lu_object_put_nocache(env, &dto->do_lu);
+ dt_object_put_nocache(env, dto);
dto = dt_locate(env, dt, &dti->dti_fid);
}
ls_device_put(env, ls);
ls = ls_device_get(dt);
if (IS_ERR(ls)) {
- dto = ERR_PTR(PTR_ERR(ls));
+ dto = ERR_CAST(ls);
} else {
/* create the object */
dti->dti_attr.la_valid = LA_MODE;
* have to open the object in other device stack */
if (!IS_ERR(dto)) {
dti->dti_fid = dto->do_lu.lo_header->loh_fid;
- lu_object_put_nocache(env, &dto->do_lu);
+ dt_object_put_nocache(env, dto);
dto = dt_locate(env, dt, &dti->dti_fid);
}
ls_device_put(env, ls);
if (rc < 0)
return rc;
+ if (S_ISDIR(p->do_lu.lo_header->loh_attr)) {
+ rc = dt_declare_ref_del(env, p, th);
+ if (rc < 0)
+ return rc;
+ }
+
rc = dt_declare_ref_del(env, c, th);
if (rc < 0)
return rc;
if (rc < 0)
GOTO(stop, rc);
+ if (S_ISDIR(dto->do_lu.lo_header->loh_attr)) {
+ dt_write_lock(env, parent, 0);
+ rc = dt_ref_del(env, parent, th);
+ dt_write_unlock(env, parent);
+ if (rc)
+ GOTO(stop, rc);
+ }
+
dt_write_lock(env, dto, 0);
rc = dt_delete(env, parent, (struct dt_key *)name, th);
if (rc < 0)
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, 1);
+ (const struct dt_key *)name, th);
GOTO(unlock, rc);
}
stop:
dt_trans_stop(env, dt, th);
out:
- lu_object_put_nocache(env, &dto->do_lu);
+ dt_object_put_nocache(env, dto);
return rc;
}
EXPORT_SYMBOL(local_object_unlink);
/* should never happen, only local_oid_storage_fini should
* drop refcount to zero */
LBUG();
- return;
}
/* after Lustre 2.3 release there may be old file to store last generated FID
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);
+ dt_object_put_nocache(env, root);
if (rc == -ENOENT) {
/* old llog lastid accessed by FID only */
if (lastid_seq != FID_SEQ_LLOG)
return PTR_ERR(o);
if (!dt_object_exists(o)) {
- lu_object_put_nocache(env, &o->do_lu);
+ dt_object_put_nocache(env, o);
return 0;
}
CDEBUG(D_INFO, "Found old llog lastid file\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);
+ dt_object_put_nocache(env, o);
if (rc == 0)
*first_oid = le32_to_cpu(losd.lso_next_oid);
return rc;
OBD_FREE_PTR(*los);
*los = NULL;
if (o != NULL && !IS_ERR(o))
- lu_object_put_nocache(env, &o->do_lu);
+ dt_object_put_nocache(env, o);
} else {
(*los)->los_seq = fid_seq(first_fid);
(*los)->los_last_oid = le64_to_cpu(lastid);
}
if (los->los_obj)
- lu_object_put_nocache(env, &los->los_obj->do_lu);
+ dt_object_put_nocache(env, los->los_obj);
list_del(&los->los_list);
OBD_FREE_PTR(los);
mutex_unlock(&ls->ls_los_mutex);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff