* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
mti->mti_off = 0;
- rc = dt_record_read(env, mdt->mdt_last_rcvd,
+ rc = dt_record_read(env, mdt->mdt_lut.lut_last_rcvd,
mdt_buf(env, &mti->mti_lsd, sizeof(mti->mti_lsd)),
&mti->mti_off);
if (rc == 0)
- lsd_le_to_cpu(&mti->mti_lsd, &mdt->mdt_lsd);
+ lsd_le_to_cpu(&mti->mti_lsd, &mdt->mdt_lut.lut_lsd);
CDEBUG(D_INFO, "read last_rcvd header rc = %d, uuid = %s, "
- "last_transno = "LPU64"\n", rc, mdt->mdt_lsd.lsd_uuid,
- mdt->mdt_lsd.lsd_last_transno);
+ "last_transno = "LPU64"\n", rc, mdt->mdt_lut.lut_lsd.lsd_uuid,
+ mdt->mdt_lut.lut_lsd.lsd_last_transno);
return rc;
}
mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
mti->mti_off = 0;
- lsd_cpu_to_le(&mdt->mdt_lsd, &mti->mti_lsd);
+ lsd_cpu_to_le(&mdt->mdt_lut.lut_lsd, &mti->mti_lsd);
- rc = dt_record_write(env, mdt->mdt_last_rcvd,
+ rc = dt_record_write(env, mdt->mdt_lut.lut_last_rcvd,
mdt_buf_const(env, &mti->mti_lsd,
sizeof(mti->mti_lsd)),
&mti->mti_off, th);
CDEBUG(D_INFO, "write last_rcvd header rc = %d, uuid = %s, "
- "last_transno = "LPU64"\n", rc, mdt->mdt_lsd.lsd_uuid,
- mdt->mdt_lsd.lsd_last_transno);
+ "last_transno = "LPU64"\n", rc, mdt->mdt_lut.lut_lsd.lsd_uuid,
+ mdt->mdt_lut.lut_lsd.lsd_last_transno);
RETURN(rc);
}
mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
tmp = &mti->mti_lcd;
- rc = dt_record_read(env, mdt->mdt_last_rcvd,
+ rc = dt_record_read(env, mdt->mdt_lut.lut_last_rcvd,
mdt_buf(env, tmp, sizeof(*tmp)), off);
if (rc == 0) {
check_lcd(mdt2obd_dev(mdt)->obd_name, index, tmp);
lcd_cpu_to_le(lcd, tmp);
- rc = dt_record_write(env, mdt->mdt_last_rcvd,
+ rc = dt_record_write(env, mdt->mdt_lut.lut_last_rcvd,
mdt_buf_const(env, tmp, sizeof(*tmp)), off, th);
CDEBUG(D_INFO, "write lcd @%d rc = %d, uuid = %s, last_transno = "LPU64
struct mdt_device *mdt,
unsigned long last_size)
{
- struct lr_server_data *lsd = &mdt->mdt_lsd;
- struct lsd_client_data *lcd = NULL;
+ struct lr_server_data *lsd = &mdt->mdt_lut.lut_lsd;
+ struct lsd_client_data *lcd;
struct obd_device *obd = mdt2obd_dev(mdt);
loff_t off;
int cl_idx;
int rc = 0;
ENTRY;
+ OBD_ALLOC_PTR(lcd);
+ if (!lcd)
+ RETURN(-ENOMEM);
+
/* When we do a clean MDS shutdown, we save the last_transno into
* the header. If we find clients with higher last_transno values
* then those clients may need recovery done. */
off < last_size; cl_idx++) {
__u64 last_transno;
struct obd_export *exp;
-
- if (!lcd) {
- OBD_ALLOC_PTR(lcd);
- if (!lcd)
- RETURN(-ENOMEM);
- }
+ struct mdt_thread_info *mti;
off = lsd->lsd_client_start +
cl_idx * lsd->lsd_client_size;
if (IS_ERR(exp)) {
if (PTR_ERR(exp) == -EALREADY) {
/* export already exists, zero out this one */
- lcd->lcd_uuid[0] = '\0';
- } else {
- GOTO(err_client, rc = PTR_ERR(exp));
+ CERROR("Duplicate export %s!\n", lcd->lcd_uuid);
+ continue;
}
- } else {
- struct mdt_thread_info *mti;
- mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
- LASSERT(mti != NULL);
- mti->mti_exp = exp;
- exp->exp_mdt_data.med_lcd = lcd;
- rc = mdt_client_add(env, mdt, cl_idx);
- /* can't fail existing */
- LASSERTF(rc == 0, "rc = %d\n", rc);
- /* VBR: set export last committed version */
- exp->exp_last_committed = last_transno;
- lcd = NULL;
- cfs_spin_lock(&exp->exp_lock);
- exp->exp_connecting = 0;
- exp->exp_in_recovery = 0;
- cfs_spin_unlock(&exp->exp_lock);
- obd->obd_max_recoverable_clients++;
- class_export_put(exp);
+ GOTO(err_client, rc = PTR_ERR(exp));
}
+ mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
+ LASSERT(mti != NULL);
+ mti->mti_exp = exp;
+ /* copy on-disk lcd to the export */
+ *exp->exp_target_data.ted_lcd = *lcd;
+ rc = mdt_client_add(env, mdt, cl_idx);
+ /* can't fail existing */
+ LASSERTF(rc == 0, "rc = %d\n", rc);
+ /* VBR: set export last committed version */
+ exp->exp_last_committed = last_transno;
+ cfs_spin_lock(&exp->exp_lock);
+ exp->exp_connecting = 0;
+ exp->exp_in_recovery = 0;
+ cfs_spin_unlock(&exp->exp_lock);
+ obd->obd_max_recoverable_clients++;
+ class_export_put(exp);
+
CDEBUG(D_OTHER, "client at idx %d has last_transno="LPU64"\n",
cl_idx, last_transno);
/* protect __u64 value update */
- cfs_spin_lock(&mdt->mdt_transno_lock);
- mdt->mdt_last_transno = max(last_transno,
- mdt->mdt_last_transno);
- cfs_spin_unlock(&mdt->mdt_transno_lock);
+ cfs_spin_lock(&mdt->mdt_lut.lut_translock);
+ mdt->mdt_lut.lut_last_transno = max(last_transno,
+ mdt->mdt_lut.lut_last_transno);
+ cfs_spin_unlock(&mdt->mdt_lut.lut_translock);
}
err_client:
- if (lcd)
- OBD_FREE_PTR(lcd);
+ OBD_FREE_PTR(lcd);
RETURN(rc);
}
struct mdt_device *mdt,
struct lustre_sb_info *lsi)
{
- struct lr_server_data *lsd = &mdt->mdt_lsd;
+ struct lr_server_data *lsd = &mdt->mdt_lut.lut_lsd;
struct lsd_client_data *lcd = NULL;
struct obd_device *obd = mdt2obd_dev(mdt);
struct mdt_thread_info *mti;
LASSERT(mti != NULL);
la = &mti->mti_attr.ma_attr;
- obj = mdt->mdt_last_rcvd;
- rc = obj->do_ops->do_attr_get(env, mdt->mdt_last_rcvd, la, BYPASS_CAPA);
+ obj = mdt->mdt_lut.lut_last_rcvd;
+ rc = obj->do_ops->do_attr_get(env, obj, la, BYPASS_CAPA);
if (rc)
RETURN(rc);
}
/** Interop: evict all clients at first boot with 1.8 last_rcvd */
if (!(lsd->lsd_feature_compat & OBD_COMPAT_20)) {
- LCONSOLE_WARN("Mounting %s at first time on 1.8 FS, remove all"
- " clients for interop needs\n", obd->obd_name);
- simple_truncate(lsi->lsi_srv_mnt->mnt_sb->s_root,
- lsi->lsi_srv_mnt, LAST_RCVD,
- lsd->lsd_client_start);
- last_rcvd_size = lsd->lsd_client_start;
+ if (last_rcvd_size > lsd->lsd_client_start) {
+ LCONSOLE_WARN("Mounting %s at first time on 1.8 FS, "
+ "remove all clients for interop needs\n",
+ obd->obd_name);
+ simple_truncate(lsi->lsi_srv_mnt->mnt_sb->s_root,
+ lsi->lsi_srv_mnt, LAST_RCVD,
+ lsd->lsd_client_start);
+ last_rcvd_size = lsd->lsd_client_start;
+ }
/** set 2.0 flag to upgrade/downgrade between 1.8 and 2.0 */
lsd->lsd_feature_compat |= OBD_COMPAT_20;
}
lsd->lsd_feature_incompat |= OBD_INCOMPAT_FID;
- cfs_spin_lock(&mdt->mdt_transno_lock);
- mdt->mdt_last_transno = lsd->lsd_last_transno;
- cfs_spin_unlock(&mdt->mdt_transno_lock);
+ cfs_spin_lock(&mdt->mdt_lut.lut_translock);
+ mdt->mdt_lut.lut_last_transno = lsd->lsd_last_transno;
+ cfs_spin_unlock(&mdt->mdt_lut.lut_translock);
CDEBUG(D_INODE, "========BEGIN DUMPING LAST_RCVD========\n");
CDEBUG(D_INODE, "%s: server last_transno: "LPU64"\n",
- obd->obd_name, mdt->mdt_last_transno);
+ obd->obd_name, mdt->mdt_lut.lut_last_transno);
CDEBUG(D_INODE, "%s: server mount_count: "LPU64"\n",
obd->obd_name, mount_count + 1);
CDEBUG(D_INODE, "%s: server data size: %u\n",
if (rc)
GOTO(err_client, rc);
- cfs_spin_lock(&mdt->mdt_transno_lock);
+ cfs_spin_lock(&mdt->mdt_lut.lut_translock);
/* obd_last_committed is used for compatibility
* with other lustre recovery code */
- obd->obd_last_committed = mdt->mdt_last_transno;
- cfs_spin_unlock(&mdt->mdt_transno_lock);
+ obd->obd_last_committed = mdt->mdt_lut.lut_last_transno;
+ cfs_spin_unlock(&mdt->mdt_lut.lut_translock);
- mdt->mdt_mount_count = mount_count + 1;
- lsd->lsd_mount_count = mdt->mdt_mount_count;
+ obd->u.obt.obt_mount_count = mount_count + 1;
+ lsd->lsd_mount_count = obd->u.obt.obt_mount_count;
/* save it, so mount count and last_transno is current */
rc = mdt_server_data_update(env, mdt);
RETURN(PTR_ERR(th));
CDEBUG(D_SUPER, "MDS mount_count is "LPU64", last_transno is "LPU64"\n",
- mdt->mdt_mount_count, mdt->mdt_last_transno);
+ mdt->mdt_lut.lut_obd->u.obt.obt_mount_count,
+ mdt->mdt_lut.lut_last_transno);
- cfs_spin_lock(&mdt->mdt_transno_lock);
- mdt->mdt_lsd.lsd_last_transno = mdt->mdt_last_transno;
- cfs_spin_unlock(&mdt->mdt_transno_lock);
+ cfs_spin_lock(&mdt->mdt_lut.lut_translock);
+ mdt->mdt_lut.lut_lsd.lsd_last_transno = mdt->mdt_lut.lut_last_transno;
+ cfs_spin_unlock(&mdt->mdt_lut.lut_translock);
rc = mdt_last_rcvd_header_write(env, mdt, th);
mdt_trans_stop(env, mdt, th);
int mdt_client_new(const struct lu_env *env, struct mdt_device *mdt)
{
- unsigned long *bitmap = mdt->mdt_client_bitmap;
+ unsigned long *bitmap = mdt->mdt_lut.lut_client_bitmap;
struct mdt_thread_info *mti;
- struct mdt_export_data *med;
- struct lsd_client_data *lcd;
- struct lr_server_data *lsd = &mdt->mdt_lsd;
+ struct tg_export_data *ted;
+ struct lr_server_data *lsd = &mdt->mdt_lut.lut_lsd;
struct obd_device *obd = mdt2obd_dev(mdt);
struct thandle *th;
loff_t off;
mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
LASSERT(mti != NULL);
- med = &mti->mti_exp->exp_mdt_data;
- lcd = med->med_lcd;
+ ted = &mti->mti_exp->exp_target_data;
LASSERT(bitmap != NULL);
- if (!strcmp(med->med_lcd->lcd_uuid, obd->obd_uuid.uuid))
+ if (!strcmp(ted->ted_lcd->lcd_uuid, obd->obd_uuid.uuid))
RETURN(0);
/* the bitmap operations can handle cl_idx > sizeof(long) * 8, so
* there's no need for extra complication here
*/
- cfs_spin_lock(&mdt->mdt_client_bitmap_lock);
+ cfs_spin_lock(&mdt->mdt_lut.lut_client_bitmap_lock);
cl_idx = cfs_find_first_zero_bit(bitmap, LR_MAX_CLIENTS);
if (cl_idx >= LR_MAX_CLIENTS ||
OBD_FAIL_CHECK(OBD_FAIL_MDS_CLIENT_ADD)) {
CERROR("no room for %u clients - fix LR_MAX_CLIENTS\n",
cl_idx);
- cfs_spin_unlock(&mdt->mdt_client_bitmap_lock);
+ cfs_spin_unlock(&mdt->mdt_lut.lut_client_bitmap_lock);
RETURN(-EOVERFLOW);
}
cfs_set_bit(cl_idx, bitmap);
- cfs_spin_unlock(&mdt->mdt_client_bitmap_lock);
+ cfs_spin_unlock(&mdt->mdt_lut.lut_client_bitmap_lock);
CDEBUG(D_INFO, "client at idx %d with UUID '%s' added\n",
- cl_idx, med->med_lcd->lcd_uuid);
+ cl_idx, ted->ted_lcd->lcd_uuid);
- med->med_lr_idx = cl_idx;
- med->med_lr_off = lsd->lsd_client_start +
+ ted->ted_lr_idx = cl_idx;
+ ted->ted_lr_off = lsd->lsd_client_start +
(cl_idx * lsd->lsd_client_size);
- cfs_init_mutex(&med->med_lcd_lock);
+ cfs_init_mutex(&ted->ted_lcd_lock);
- LASSERTF(med->med_lr_off > 0, "med_lr_off = %llu\n", med->med_lr_off);
+ LASSERTF(ted->ted_lr_off > 0, "ted_lr_off = %llu\n", ted->ted_lr_off);
/* Write new client data. */
- off = med->med_lr_off;
+ off = ted->ted_lr_off;
+
+ if (OBD_FAIL_CHECK(OBD_FAIL_TGT_CLIENT_ADD))
+ RETURN(-ENOSPC);
+
mdt_trans_credit_init(env, mdt, MDT_TXN_LAST_RCVD_WRITE_OP);
th = mdt_trans_start(env, mdt);
mti->mti_exp->exp_need_sync = 1;
cfs_spin_unlock(&mti->mti_exp->exp_lock);
- rc = mdt_last_rcvd_write(env, mdt, lcd, &off, th);
+ rc = mdt_last_rcvd_write(env, mdt, ted->ted_lcd, &off, th);
CDEBUG(D_INFO, "wrote client lcd at idx %u off %llu (len %u)\n",
- cl_idx, med->med_lr_off, (int)sizeof(*lcd));
+ cl_idx, ted->ted_lr_off, (int)sizeof(*(ted->ted_lcd)));
mdt_trans_stop(env, mdt, th);
RETURN(rc);
struct mdt_device *mdt, int cl_idx)
{
struct mdt_thread_info *mti;
- struct mdt_export_data *med;
- unsigned long *bitmap = mdt->mdt_client_bitmap;
+ struct tg_export_data *ted;
+ unsigned long *bitmap = mdt->mdt_lut.lut_client_bitmap;
struct obd_device *obd = mdt2obd_dev(mdt);
- struct lr_server_data *lsd = &mdt->mdt_lsd;
+ struct lr_server_data *lsd = &mdt->mdt_lut.lut_lsd;
int rc = 0;
ENTRY;
mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
LASSERT(mti != NULL);
- med = &mti->mti_exp->exp_mdt_data;
+ ted = &mti->mti_exp->exp_target_data;
LASSERT(bitmap != NULL);
LASSERTF(cl_idx >= 0, "%d\n", cl_idx);
- if (!strcmp(med->med_lcd->lcd_uuid, obd->obd_uuid.uuid))
+ if (!strcmp(ted->ted_lcd->lcd_uuid, obd->obd_uuid.uuid))
RETURN(0);
- cfs_spin_lock(&mdt->mdt_client_bitmap_lock);
+ cfs_spin_lock(&mdt->mdt_lut.lut_client_bitmap_lock);
if (cfs_test_and_set_bit(cl_idx, bitmap)) {
CERROR("MDS client %d: bit already set in bitmap!!\n",
cl_idx);
LBUG();
}
- cfs_spin_unlock(&mdt->mdt_client_bitmap_lock);
+ cfs_spin_unlock(&mdt->mdt_lut.lut_client_bitmap_lock);
CDEBUG(D_INFO, "client at idx %d with UUID '%s' added\n",
- cl_idx, med->med_lcd->lcd_uuid);
+ cl_idx, ted->ted_lcd->lcd_uuid);
- med->med_lr_idx = cl_idx;
- med->med_lr_off = lsd->lsd_client_start +
+ ted->ted_lr_idx = cl_idx;
+ ted->ted_lr_off = lsd->lsd_client_start +
(cl_idx * lsd->lsd_client_size);
- cfs_init_mutex(&med->med_lcd_lock);
+ cfs_init_mutex(&ted->ted_lcd_lock);
- LASSERTF(med->med_lr_off > 0, "med_lr_off = %llu\n", med->med_lr_off);
+ LASSERTF(ted->ted_lr_off > 0, "ted_lr_off = %llu\n", ted->ted_lr_off);
RETURN(rc);
}
int mdt_client_del(const struct lu_env *env, struct mdt_device *mdt)
{
struct mdt_thread_info *mti;
- struct mdt_export_data *med;
- struct lsd_client_data *lcd;
+ struct tg_export_data *ted;
struct obd_device *obd = mdt2obd_dev(mdt);
struct obd_export *exp;
struct thandle *th;
LASSERT(mti != NULL);
exp = mti->mti_exp;
- med = &exp->exp_mdt_data;
- lcd = med->med_lcd;
- if (!lcd)
+ ted = &exp->exp_target_data;
+ if (!ted->ted_lcd)
RETURN(0);
/* XXX: If lcd_uuid were a real obd_uuid, I could use obd_uuid_equals */
- if (!strcmp(lcd->lcd_uuid, obd->obd_uuid.uuid))
+ if (!strcmp(ted->ted_lcd->lcd_uuid, obd->obd_uuid.uuid))
GOTO(free, 0);
CDEBUG(D_INFO, "freeing client at idx %u, offset %lld\n",
- med->med_lr_idx, med->med_lr_off);
+ ted->ted_lr_idx, ted->ted_lr_off);
- off = med->med_lr_off;
+ off = ted->ted_lr_off;
/*
- * Don't clear med_lr_idx here as it is likely also unset. At worst we
+ * Don't clear ted_lr_idx here as it is likely also unset. At worst we
* leak a client slot that will be cleaned on the next recovery.
*/
if (off <= 0) {
CERROR("client idx %d has offset %lld\n",
- med->med_lr_idx, off);
+ ted->ted_lr_idx, off);
GOTO(free, rc = -EINVAL);
}
* Clear the bit _after_ zeroing out the client so we don't race with
* mdt_client_add and zero out new clients.
*/
- if (!cfs_test_bit(med->med_lr_idx, mdt->mdt_client_bitmap)) {
+ if (!cfs_test_bit(ted->ted_lr_idx, mdt->mdt_lut.lut_client_bitmap)) {
CERROR("MDT client %u: bit already clear in bitmap!!\n",
- med->med_lr_idx);
+ ted->ted_lr_idx);
LBUG();
}
if (IS_ERR(th))
GOTO(free, rc = PTR_ERR(th));
- cfs_mutex_down(&med->med_lcd_lock);
- memset(lcd, 0, sizeof *lcd);
- rc = mdt_last_rcvd_write(env, mdt, lcd, &off, th);
- med->med_lcd = NULL;
- cfs_mutex_up(&med->med_lcd_lock);
+ cfs_mutex_down(&ted->ted_lcd_lock);
+ memset(ted->ted_lcd->lcd_uuid, 0, sizeof ted->ted_lcd->lcd_uuid);
+ rc = mdt_last_rcvd_write(env, mdt, ted->ted_lcd, &off, th);
+ cfs_mutex_up(&ted->ted_lcd_lock);
mdt_trans_stop(env, mdt, th);
- cfs_spin_lock(&mdt->mdt_client_bitmap_lock);
- cfs_clear_bit(med->med_lr_idx, mdt->mdt_client_bitmap);
- cfs_spin_unlock(&mdt->mdt_client_bitmap_lock);
-
CDEBUG(rc == 0 ? D_INFO : D_ERROR, "Zeroing out client idx %u in "
- "%s, rc %d\n", med->med_lr_idx, LAST_RCVD, rc);
- OBD_FREE_PTR(lcd);
+ "%s, rc %d\n", ted->ted_lr_idx, LAST_RCVD, rc);
RETURN(0);
free:
- cfs_mutex_down(&med->med_lcd_lock);
- med->med_lcd = NULL;
- cfs_mutex_up(&med->med_lcd_lock);
- OBD_FREE_PTR(lcd);
return 0;
}
{
struct mdt_device *mdt = mti->mti_mdt;
struct ptlrpc_request *req = mdt_info_req(mti);
- struct mdt_export_data *med;
+ struct tg_export_data *ted;
struct lsd_client_data *lcd;
loff_t off;
int err;
LASSERT(req);
LASSERT(req->rq_export);
LASSERT(mdt);
- med = &req->rq_export->exp_mdt_data;
- LASSERT(med);
+ ted = &req->rq_export->exp_target_data;
+ LASSERT(ted);
- cfs_mutex_down(&med->med_lcd_lock);
- lcd = med->med_lcd;
+ cfs_mutex_down(&ted->ted_lcd_lock);
+ lcd = ted->ted_lcd;
/* if the export has already been disconnected, we have no last_rcvd slot,
* update server data with latest transno then */
if (lcd == NULL) {
- cfs_mutex_up(&med->med_lcd_lock);
+ cfs_mutex_up(&ted->ted_lcd_lock);
CWARN("commit transaction for disconnected client %s: rc %d\n",
req->rq_export->exp_client_uuid.uuid, rc);
err = mdt_last_rcvd_header_write(mti->mti_env, mdt, th);
RETURN(err);
}
- off = med->med_lr_off;
+ off = ted->ted_lr_off;
LASSERT(ergo(mti->mti_transno == 0, rc != 0));
if (lustre_msg_get_opc(req->rq_reqmsg) == MDS_CLOSE ||
lustre_msg_get_opc(req->rq_reqmsg) == MDS_DONE_WRITING) {
}
if (off <= 0) {
- CERROR("client idx %d has offset %lld\n", med->med_lr_idx, off);
+ CERROR("client idx %d has offset %lld\n", ted->ted_lr_idx, off);
err = -EINVAL;
} else {
err = mdt_last_rcvd_write(mti->mti_env, mdt, lcd, &off, th);
}
- cfs_mutex_up(&med->med_lcd_lock);
+ cfs_mutex_up(&ted->ted_lcd_lock);
RETURN(err);
}
}
/* Set new object versions */
-static void mdt_versions_set(struct mdt_thread_info *info)
+static void mdt_version_set(struct mdt_thread_info *info)
{
- int i;
- for (i = 0; i < PTLRPC_NUM_VERSIONS; i++)
- if (info->mti_mos[i] != NULL)
- mo_version_set(info->mti_env,
- mdt_object_child(info->mti_mos[i]),
- info->mti_transno);
+ if (info->mti_mos != NULL) {
+ mo_version_set(info->mti_env, mdt_object_child(info->mti_mos),
+ info->mti_transno);
+ info->mti_mos = NULL;
+ }
}
/* Update last_rcvd records with latests transaction data */
}
mti->mti_has_trans = 1;
- cfs_spin_lock(&mdt->mdt_transno_lock);
+ cfs_spin_lock(&mdt->mdt_lut.lut_translock);
if (txn->th_result != 0) {
if (mti->mti_transno != 0) {
- CERROR("Replay transno "LPU64" failed: rc %i\n",
+ CERROR("Replay transno "LPU64" failed: rc %d\n",
mti->mti_transno, txn->th_result);
}
} else if (mti->mti_transno == 0) {
- mti->mti_transno = ++ mdt->mdt_last_transno;
+ mti->mti_transno = ++ mdt->mdt_lut.lut_last_transno;
} else {
/* should be replay */
- if (mti->mti_transno > mdt->mdt_last_transno)
- mdt->mdt_last_transno = mti->mti_transno;
+ if (mti->mti_transno > mdt->mdt_lut.lut_last_transno)
+ mdt->mdt_lut.lut_last_transno = mti->mti_transno;
}
- cfs_spin_unlock(&mdt->mdt_transno_lock);
+ cfs_spin_unlock(&mdt->mdt_lut.lut_translock);
/* sometimes the reply message has not been successfully packed */
LASSERT(req != NULL && req->rq_repmsg != NULL);
/** VBR: set new versions */
if (txn->th_result == 0)
- mdt_versions_set(mti);
+ mdt_version_set(mti);
/* filling reply data */
- CDEBUG(D_INODE, "transno = %llu, last_committed = %llu\n",
+ CDEBUG(D_INODE, "transno = "LPU64", last_committed = "LPU64"\n",
mti->mti_transno, req->rq_export->exp_obd->obd_last_committed);
req->rq_transno = mti->mti_transno;
oldrep->rs_opc);
svc = oldrep->rs_service;
- cfs_spin_lock (&svc->srv_lock);
+ cfs_spin_lock (&svc->srv_rs_lock);
cfs_list_del_init (&oldrep->rs_exp_list);
ptlrpc_schedule_difficult_reply (oldrep);
cfs_spin_unlock(&oldrep->rs_lock);
- cfs_spin_unlock (&svc->srv_lock);
+ cfs_spin_unlock (&svc->srv_rs_lock);
break;
}
cfs_spin_unlock(&exp->exp_lock);
struct mdt_lock_handle *lhc)
{
struct ptlrpc_request *req = mdt_info_req(mti);
- struct mdt_export_data *med = &req->rq_export->exp_mdt_data;
+ struct tg_export_data *ted = &req->rq_export->exp_target_data;
- return mdt_req_from_lcd(req, med->med_lcd);
+ return mdt_req_from_lcd(req, ted->ted_lcd);
}
static void mdt_reconstruct_create(struct mdt_thread_info *mti,
{
struct ptlrpc_request *req = mdt_info_req(mti);
struct obd_export *exp = req->rq_export;
- struct mdt_export_data *med = &exp->exp_mdt_data;
+ struct tg_export_data *ted = &exp->exp_target_data;
struct mdt_device *mdt = mti->mti_mdt;
struct mdt_object *child;
struct mdt_body *body;
int rc;
- mdt_req_from_lcd(req, med->med_lcd);
+ mdt_req_from_lcd(req, ted->ted_lcd);
if (req->rq_status)
return;
struct mdt_object *obj;
struct mdt_body *body;
- mdt_req_from_lcd(req, med->med_lcd);
+ mdt_req_from_lcd(req, med->med_ted.ted_lcd);
if (req->rq_status)
return;