* 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.
+ * Copyright (c) 2011 Whamcloud, Inc.
+ */
+/*
+ * Copyright (c) 2011 Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
static inline void set_capa_key_expiry(struct mdt_device *mdt)
{
- mdt->mdt_ck_expiry = jiffies + mdt->mdt_ck_timeout * HZ;
+ mdt->mdt_ck_expiry = jiffies + mdt->mdt_ck_timeout * CFS_HZ;
}
static void make_capa_key(struct lustre_capa_key *key,
mdsno_t mdsnum, int keyid)
{
- key->lk_mdsid = mdsnum;
+ key->lk_seq = mdsnum;
key->lk_keyid = keyid + 1;
- ll_get_random_bytes(key->lk_key, sizeof(key->lk_key));
+ cfs_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)
{
- tgt->lk_mdsid = cpu_to_le64(src->lk_mdsid);
+ tgt->lk_seq = cpu_to_le64(src->lk_seq);
tgt->lk_keyid = cpu_to_le32(src->lk_keyid);
tgt->lk_padding = cpu_to_le32(src->lk_padding);
memcpy(tgt->lk_key, src->lk_key, sizeof(src->lk_key));
static inline void lck_le_to_cpu(struct lustre_capa_key *tgt,
struct lustre_capa_key *src)
{
- tgt->lk_mdsid = le64_to_cpu(src->lk_mdsid);
+ tgt->lk_seq = le64_to_cpu(src->lk_seq);
tgt->lk_keyid = le32_to_cpu(src->lk_keyid);
tgt->lk_padding = le32_to_cpu(src->lk_padding);
memcpy(tgt->lk_key, src->lk_key, sizeof(src->lk_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);
+ th = mdt_trans_create(env, mdt);
if (IS_ERR(th))
RETURN(PTR_ERR(th));
+ rc = dt_declare_record_write(env, mdt->mdt_ck_obj,
+ sizeof(*tmp) * 3, 0, th);
+ if (rc)
+ goto stop;
+
+ rc = mdt_trans_start(env, mdt, th);
+ if (rc)
+ goto stop;
+
tmp = &mti->mti_capa_key;
for (i = 0; i < 2; i++) {
lck_cpu_to_le(tmp, &keys[i]);
- rc = mdt_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;
}
+stop:
mdt_trans_stop(env, mdt, th);
CDEBUG(D_INFO, "write capability keys rc = %d:\n", rc);
tmp = &mti->mti_capa_key;
for (i = 0; i < 2; i++) {
- rc = mdt_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;
struct ptlrpc_thread *thread = &mdt->mdt_ck_thread;
ENTRY;
- thread->t_flags |= SVC_EVENT;
+ thread_add_flags(thread, SVC_EVENT);
cfs_waitq_signal(&thread->t_ctl_waitq);
EXIT;
}
int rc;
ENTRY;
- ptlrpc_daemonize("mdt_ck");
+ cfs_daemonize_ctxt("mdt_ck");
cfs_block_allsigs();
- thread->t_flags = SVC_RUNNING;
+ thread_set_flags(thread, 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;
+ env.le_ctx.lc_cookie = 0x1;
info = lu_context_key_get(&env.le_ctx, &mdt_thread_key);
LASSERT(info != NULL);
mdsnum = mdt_md_site(mdt)->ms_node_id;
while (1) {
l_wait_event(thread->t_ctl_waitq,
- thread->t_flags & (SVC_STOPPING | SVC_EVENT),
+ thread_is_stopping(thread) ||
+ thread_is_event(thread),
&lwi);
- if (thread->t_flags & SVC_STOPPING)
+ if (thread_is_stopping(thread))
break;
- thread->t_flags &= ~SVC_EVENT;
+ thread_clear_flags(thread, SVC_EVENT);
if (cfs_time_before(cfs_time_current(), mdt->mdt_ck_expiry))
break;
next = mdt->mdt_child;
rc = next->md_ops->mdo_update_capa_key(&env, next, tmp);
if (!rc) {
- spin_lock(&capa_lock);
+ cfs_spin_lock(&capa_lock);
*bkey = *rkey;
*rkey = *tmp;
- spin_unlock(&capa_lock);
+ cfs_spin_unlock(&capa_lock);
rc = write_capa_keys(&env, mdt, mdt->mdt_capa_keys);
if (rc) {
- spin_lock(&capa_lock);
+ cfs_spin_lock(&capa_lock);
*rkey = *bkey;
memset(bkey, 0, sizeof(*bkey));
- spin_unlock(&capa_lock);
+ cfs_spin_unlock(&capa_lock);
} else {
set_capa_key_expiry(mdt);
DEBUG_CAPA_KEY(D_SEC, rkey, "new");
if (rc) {
DEBUG_CAPA_KEY(D_ERROR, rkey, "update failed for");
/* next retry is in 300 sec */
- mdt->mdt_ck_expiry = jiffies + 300 * HZ;
+ mdt->mdt_ck_expiry = jiffies + 300 * CFS_HZ;
}
cfs_timer_arm(&mdt->mdt_ck_timer, mdt->mdt_ck_expiry);
}
lu_env_fini(&env);
- thread->t_flags = SVC_STOPPED;
+ thread_set_flags(thread, SVC_STOPPED);
cfs_waitq_signal(&thread->t_ctl_waitq);
RETURN(0);
}
int rc;
cfs_waitq_init(&thread->t_ctl_waitq);
- rc = cfs_kernel_thread(mdt_ck_thread_main, mdt,
- (CLONE_VM | CLONE_FILES));
+ rc = cfs_create_thread(mdt_ck_thread_main, mdt, CFS_DAEMON_FLAGS);
if (rc < 0) {
CERROR("cannot start mdt_ck thread, rc = %d\n", rc);
return rc;
}
- cfs_wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_RUNNING);
+ l_wait_condition(thread->t_ctl_waitq, thread_is_running(thread));
return 0;
}
{
struct ptlrpc_thread *thread = &mdt->mdt_ck_thread;
- if (!(thread->t_flags & SVC_RUNNING))
+ if (!thread_is_running(thread))
return;
- thread->t_flags = SVC_STOPPING;
+ thread_set_flags(thread, SVC_STOPPING);
cfs_waitq_signal(&thread->t_ctl_waitq);
- cfs_wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_STOPPED);
+ l_wait_condition(thread->t_ctl_waitq, thread_is_stopped(thread));
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff