#define TX_ALLOC_STEP 8
static struct tx_arg *tx_add_exec(struct thandle_exec_args *ta,
tx_exec_func_t func, tx_exec_func_t undo,
- char *file, int line)
+ const char *file, int line)
{
int rc;
int i;
struct dt_object_format *dof,
struct thandle_exec_args *ta,
struct object_update_reply *reply,
- int index, char *file, int line)
+ int index, const char *file, int line)
{
struct tx_arg *arg;
int rc;
const struct lu_attr *attr,
struct thandle_exec_args *th,
struct object_update_reply *reply,
- int index, char *file, int line)
+ int index, const char *file, int line)
{
struct tx_arg *arg;
int rc;
rc = dt_attr_get(env, obj, la, NULL);
if (rc)
GOTO(out_unlock, rc);
- /*
- * If it is a directory, we will also check whether the
- * directory is empty.
- * la_flags = 0 : Empty.
- * = 1 : Not empty.
- */
- la->la_flags = 0;
- if (S_ISDIR(la->la_mode)) {
- struct dt_it *it;
- const struct dt_it_ops *iops;
-
- if (!dt_try_as_dir(env, obj))
- GOTO(out_unlock, rc = -ENOTDIR);
-
- iops = &obj->do_index_ops->dio_it;
- it = iops->init(env, obj, LUDA_64BITHASH, BYPASS_CAPA);
- if (!IS_ERR(it)) {
- int result;
- result = iops->get(env, it, (const void *)"");
- if (result > 0) {
- int i;
- for (result = 0, i = 0; result == 0 && i < 3;
- ++i)
- result = iops->next(env, it);
- if (result == 0)
- la->la_flags = 1;
- } else if (result == 0)
- /*
- * Huh? Index contains no zero key?
- */
- rc = -EIO;
-
- iops->put(env, it);
- iops->fini(env, it);
- }
- }
obdo->o_valid = 0;
obdo_from_la(obdo, la, la->la_valid);
const char *name, int flags,
struct thandle_exec_args *ta,
struct object_update_reply *reply,
- int index, char *file, int line)
+ int index, const char *file, int line)
{
struct tx_arg *arg;
int rc;
RETURN(rc);
}
+static int out_tx_xattr_del_exec(const struct lu_env *env, struct thandle *th,
+ struct tx_arg *arg)
+{
+ struct dt_object *dt_obj = arg->object;
+ int rc;
+
+ CDEBUG(D_INFO, "%s: del xattr name '%s' on "DFID"\n",
+ dt_obd_name(th->th_dev), arg->u.xattr_set.name,
+ PFID(lu_object_fid(&dt_obj->do_lu)));
+
+ if (!lu_object_exists(&dt_obj->do_lu))
+ GOTO(out, rc = -ENOENT);
+
+ dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
+ rc = dt_xattr_del(env, dt_obj, arg->u.xattr_set.name,
+ th, NULL);
+ dt_write_unlock(env, dt_obj);
+out:
+ CDEBUG(D_INFO, "%s: insert xattr del reply %p index %d: rc = %d\n",
+ dt_obd_name(th->th_dev), arg->reply, arg->index, rc);
+
+ object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
+
+ return rc;
+}
+
+static int __out_tx_xattr_del(const struct lu_env *env,
+ struct dt_object *dt_obj, const char *name,
+ struct thandle_exec_args *ta,
+ struct object_update_reply *reply,
+ int index, const char *file, int line)
+{
+ struct tx_arg *arg;
+ int rc;
+
+ rc = dt_declare_xattr_del(env, dt_obj, name, ta->ta_handle);
+ if (rc != 0)
+ return rc;
+
+ arg = tx_add_exec(ta, out_tx_xattr_del_exec, NULL, file, line);
+ if (IS_ERR(arg))
+ return PTR_ERR(arg);
+
+ lu_object_get(&dt_obj->do_lu);
+ arg->object = dt_obj;
+ arg->u.xattr_set.name = name;
+ arg->reply = reply;
+ arg->index = index;
+ return 0;
+}
+
+static int out_xattr_del(struct tgt_session_info *tsi)
+{
+ struct tgt_thread_info *tti = tgt_th_info(tsi->tsi_env);
+ struct object_update *update = tti->tti_u.update.tti_update;
+ struct dt_object *obj = tti->tti_u.update.tti_dt_object;
+ char *name;
+ int rc;
+ ENTRY;
+
+ name = object_update_param_get(update, 0, NULL);
+ if (name == NULL) {
+ CERROR("%s: empty name for xattr set: rc = %d\n",
+ tgt_name(tsi->tsi_tgt), -EPROTO);
+ RETURN(err_serious(-EPROTO));
+ }
+
+ rc = out_tx_xattr_del(tsi->tsi_env, obj, name, &tti->tti_tea,
+ tti->tti_u.update.tti_update_reply,
+ tti->tti_u.update.tti_update_reply_index);
+ RETURN(rc);
+}
+
static int out_obj_ref_add(const struct lu_env *env,
struct dt_object *dt_obj,
struct thandle *th)
struct dt_object *dt_obj,
struct thandle_exec_args *ta,
struct object_update_reply *reply,
- int index, char *file, int line)
+ int index, const char *file, int line)
{
struct tx_arg *arg;
int rc;
struct dt_object *dt_obj,
struct thandle_exec_args *ta,
struct object_update_reply *reply,
- int index, char *file, int line)
+ int index, const char *file, int line)
{
struct tx_arg *arg;
int rc;
{
int rc;
- CDEBUG(D_INFO, "%s: index insert "DFID" name: %s fid "DFID"\n",
+ CDEBUG(D_INFO, "%s: index insert "DFID" name: %s fid "DFID", type %u\n",
dt_obd_name(th->th_dev), PFID(lu_object_fid(&dt_obj->do_lu)),
- (char *)key, PFID((struct lu_fid *)rec));
+ (char *)key, PFID(((struct dt_insert_rec *)rec)->rec_fid),
+ ((struct dt_insert_rec *)rec)->rec_type);
if (dt_try_as_dir(env, dt_obj) == 0)
return -ENOTDIR;
struct dt_object *dt_obj = arg->object;
int rc;
- rc = out_obj_index_insert(env, dt_obj, arg->u.insert.rec,
+ rc = out_obj_index_insert(env, dt_obj,
+ (const struct dt_rec *)&arg->u.insert.rec,
arg->u.insert.key, th);
CDEBUG(D_INFO, "%s: insert idx insert reply %p index %d: rc = %d\n",
static int __out_tx_index_insert(const struct lu_env *env,
struct dt_object *dt_obj,
- char *name, struct lu_fid *fid,
+ const struct dt_rec *rec,
+ const struct dt_key *key,
struct thandle_exec_args *ta,
struct object_update_reply *reply,
- int index, char *file, int line)
+ int index, const char *file, int line)
{
struct tx_arg *arg;
int rc;
return rc;
}
- rc = dt_declare_insert(env, dt_obj, (struct dt_rec *)fid,
- (struct dt_key *)name, ta->ta_handle);
+ rc = dt_declare_insert(env, dt_obj, rec, key, ta->ta_handle);
if (rc != 0)
return rc;
arg->object = dt_obj;
arg->reply = reply;
arg->index = index;
- arg->u.insert.rec = (struct dt_rec *)fid;
- arg->u.insert.key = (struct dt_key *)name;
+ arg->u.insert.rec = *(const struct dt_insert_rec *)rec;
+ arg->u.insert.key = key;
return 0;
}
static int out_index_insert(struct tgt_session_info *tsi)
{
- struct tgt_thread_info *tti = tgt_th_info(tsi->tsi_env);
- struct object_update *update = tti->tti_u.update.tti_update;
- struct dt_object *obj = tti->tti_u.update.tti_dt_object;
- struct lu_fid *fid;
- char *name;
- int rc = 0;
- int size;
-
+ struct tgt_thread_info *tti = tgt_th_info(tsi->tsi_env);
+ struct object_update *update = tti->tti_u.update.tti_update;
+ struct dt_object *obj = tti->tti_u.update.tti_dt_object;
+ struct dt_insert_rec *rec = &tti->tti_rec;
+ struct lu_fid *fid;
+ char *name;
+ __u32 *ptype;
+ int rc = 0;
+ int size;
ENTRY;
name = object_update_param_get(update, 0, NULL);
RETURN(err_serious(-EPROTO));
}
- rc = out_tx_index_insert(tsi->tsi_env, obj, name, fid,
- &tti->tti_tea,
+ ptype = object_update_param_get(update, 2, &size);
+ if (ptype == NULL || size != sizeof(*ptype)) {
+ CERROR("%s: invalid type for index insert: rc = %d\n",
+ tgt_name(tsi->tsi_tgt), -EPROTO);
+ RETURN(err_serious(-EPROTO));
+ }
+
+ if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+ __swab32s(ptype);
+
+ rec->rec_fid = fid;
+ rec->rec_type = *ptype;
+
+ rc = out_tx_index_insert(tsi->tsi_env, obj, (const struct dt_rec *)rec,
+ (const struct dt_key *)name, &tti->tti_tea,
tti->tti_u.update.tti_update_reply,
tti->tti_u.update.tti_update_reply_index);
RETURN(rc);
rc = out_obj_index_delete(env, arg->object, arg->u.insert.key, th);
- CDEBUG(D_INFO, "%s: insert idx insert reply %p index %d: rc = %d\n",
+ CDEBUG(D_INFO, "%s: delete idx insert reply %p index %d: rc = %d\n",
dt_obd_name(th->th_dev), arg->reply, arg->index, rc);
object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
}
static int __out_tx_index_delete(const struct lu_env *env,
- struct dt_object *dt_obj, char *name,
+ struct dt_object *dt_obj,
+ const struct dt_key *key,
struct thandle_exec_args *ta,
struct object_update_reply *reply,
- int index, char *file, int line)
+ int index, const char *file, int line)
{
struct tx_arg *arg;
int rc;
}
LASSERT(ta->ta_handle != NULL);
- rc = dt_declare_delete(env, dt_obj, (struct dt_key *)name,
- ta->ta_handle);
+ rc = dt_declare_delete(env, dt_obj, key, ta->ta_handle);
if (rc != 0)
return rc;
arg->object = dt_obj;
arg->reply = reply;
arg->index = index;
- arg->u.insert.key = (struct dt_key *)name;
+ arg->u.insert.key = key;
return 0;
}
RETURN(err_serious(-EPROTO));
}
- rc = out_tx_index_delete(tsi->tsi_env, obj, name, &tti->tti_tea,
+ rc = out_tx_index_delete(tsi->tsi_env, obj, (const struct dt_key *)name,
+ &tti->tti_tea,
tti->tti_u.update.tti_update_reply,
tti->tti_u.update.tti_update_reply_index);
RETURN(rc);
static int __out_tx_destroy(const struct lu_env *env, struct dt_object *dt_obj,
struct thandle_exec_args *ta,
struct object_update_reply *reply,
- int index, char *file, int line)
+ int index, const char *file, int line)
{
struct tx_arg *arg;
int rc;
const struct lu_buf *buf,
loff_t pos, struct thandle_exec_args *ta,
struct object_update_reply *reply,
- int index, char *file, int line)
+ int index, const char *file, int line)
{
struct tx_arg *arg;
int rc;
.th_version = 0, \
}
-#define out_handler mdt_handler
static struct tgt_handler out_update_ops[] = {
DEF_OUT_HNDL(OUT_CREATE, "out_create", MUTABOR | HABEO_REFERO,
out_create),
out_attr_get),
DEF_OUT_HNDL(OUT_XATTR_SET, "out_xattr_set", MUTABOR | HABEO_REFERO,
out_xattr_set),
+ DEF_OUT_HNDL(OUT_XATTR_DEL, "out_xattr_del", MUTABOR | HABEO_REFERO,
+ out_xattr_del),
DEF_OUT_HNDL(OUT_XATTR_GET, "out_xattr_get", HABEO_REFERO,
out_xattr_get),
DEF_OUT_HNDL(OUT_INDEX_LOOKUP, "out_index_lookup", HABEO_REFERO,
static int out_tx_start(const struct lu_env *env, struct dt_device *dt,
struct thandle_exec_args *ta, struct obd_export *exp)
{
- memset(ta, 0, sizeof(*ta));
+ ta->ta_argno = 0;
ta->ta_handle = dt_trans_create(env, dt);
if (IS_ERR(ta->ta_handle)) {
int rc;
ta->ta_args[i]->object = NULL;
}
}
+ ta->ta_handle = NULL;
+ ta->ta_argno = 0;
return rc;
}
tti->tti_u.update.tti_update_reply = reply;
tti->tti_mult_trans = !req_is_replay(tgt_ses_req(tsi));
- memset(ta, 0, sizeof(*ta));
/* Walk through updates in the request to execute them synchronously */
for (i = 0; i < count; i++) {
struct tgt_handler *h;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff