Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correctly set lsm size for open replay.
[fs/lustre-release.git]
/
lustre
/
mdt
/
mdt_capa.c
diff --git
a/lustre/mdt/mdt_capa.c
b/lustre/mdt/mdt_capa.c
index
1c887eb
..
9672420
100644
(file)
--- a/
lustre/mdt/mdt_capa.c
+++ b/
lustre/mdt/mdt_capa.c
@@
-60,10
+60,6
@@
static void make_capa_key(struct lustre_capa_key *key,
ll_get_random_bytes(key->lk_key, sizeof(key->lk_key));
}
ll_get_random_bytes(key->lk_key, sizeof(key->lk_key));
}
-enum {
- MDT_TXN_CAPA_KEYS_WRITE_CREDITS = 1
-};
-
static inline void lck_cpu_to_le(struct lustre_capa_key *tgt,
struct lustre_capa_key *src)
{
static inline void lck_cpu_to_le(struct lustre_capa_key *tgt,
struct lustre_capa_key *src)
{
@@
-93,8
+89,8
@@
static int write_capa_keys(const struct lu_env *env,
int i, rc;
mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
int i, rc;
mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
-
- th = mdt_trans_start(env, mdt
, MDT_TXN_CAPA_KEYS_WRITE_CREDITS
);
+ mdt_trans_credit_init(env, mdt, MDT_TXN_CAPA_KEYS_WRITE_OP);
+ th = mdt_trans_start(env, mdt);
if (IS_ERR(th))
RETURN(PTR_ERR(th));
if (IS_ERR(th))
RETURN(PTR_ERR(th));
@@
-103,9
+99,9
@@
static int write_capa_keys(const struct lu_env *env,
for (i = 0; i < 2; i++) {
lck_cpu_to_le(tmp, &keys[i]);
for (i = 0; i < 2; i++) {
lck_cpu_to_le(tmp, &keys[i]);
- rc =
m
dt_record_write(env, mdt->mdt_ck_obj,
-
mdt_buf_const(env, tmp, sizeof(*tmp)),
-
&off, th);
+ rc = dt_record_write(env, mdt->mdt_ck_obj,
+ mdt_buf_const(env, tmp, sizeof(*tmp)),
+ &off, th);
if (rc)
break;
}
if (rc)
break;
}
@@
-129,8
+125,8
@@
static int read_capa_keys(const struct lu_env *env,
tmp = &mti->mti_capa_key;
for (i = 0; i < 2; i++) {
tmp = &mti->mti_capa_key;
for (i = 0; i < 2; i++) {
- rc =
m
dt_record_read(env, mdt->mdt_ck_obj,
-
mdt_buf(env, tmp, sizeof(*tmp)), &off);
+ rc = dt_record_read(env, mdt->mdt_ck_obj,
+ mdt_buf(env, tmp, sizeof(*tmp)), &off);
if (rc)
return rc;
if (rc)
return rc;
@@
-152,7
+148,7
@@
int mdt_capa_keys_init(const struct lu_env *env, struct mdt_device *mdt)
int rc;
ENTRY;
int rc;
ENTRY;
- mdsnum = mdt
->mdt_md_dev.md_lu_dev.ld_site->l
s_node_id;
+ mdsnum = mdt
_md_site(mdt)->m
s_node_id;
mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
LASSERT(mti != NULL);
mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
LASSERT(mti != NULL);
@@
-216,24
+212,25
@@
static int mdt_ck_thread_main(void *args)
int rc;
ENTRY;
int rc;
ENTRY;
-
ptlrpc_daemonize
("mdt_ck");
+
cfs_daemonize_ctxt
("mdt_ck");
cfs_block_allsigs();
thread->t_flags = SVC_RUNNING;
cfs_waitq_signal(&thread->t_ctl_waitq);
cfs_block_allsigs();
thread->t_flags = SVC_RUNNING;
cfs_waitq_signal(&thread->t_ctl_waitq);
- rc = lu_env_init(&env,
NULL, LCT_MD_THREAD
);
+ rc = lu_env_init(&env,
LCT_MD_THREAD|LCT_REMEMBER|LCT_NOREF
);
if (rc)
RETURN(rc);
thread->t_env = &env;
env.le_ctx.lc_thread = thread;
if (rc)
RETURN(rc);
thread->t_env = &env;
env.le_ctx.lc_thread = thread;
+ env.le_ctx.lc_cookie = 0x1;
info = lu_context_key_get(&env.le_ctx, &mdt_thread_key);
LASSERT(info != NULL);
tmp = &info->mti_capa_key;
info = lu_context_key_get(&env.le_ctx, &mdt_thread_key);
LASSERT(info != NULL);
tmp = &info->mti_capa_key;
- mdsnum = mdt
->mdt_md_dev.md_lu_dev.ld_site->l
s_node_id;
+ mdsnum = mdt
_md_site(mdt)->m
s_node_id;
while (1) {
l_wait_event(thread->t_ctl_waitq,
thread->t_flags & (SVC_STOPPING | SVC_EVENT),
while (1) {
l_wait_event(thread->t_ctl_waitq,
thread->t_flags & (SVC_STOPPING | SVC_EVENT),