* 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.
*/
/*
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));
}
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 rc;
ENTRY;
- ptlrpc_daemonize("mdt_ck");
+ cfs_daemonize_ctxt("mdt_ck");
cfs_block_allsigs();
thread->t_flags = SVC_RUNNING;
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);
cfs_waitq_init(&thread->t_ctl_waitq);
rc = cfs_kernel_thread(mdt_ck_thread_main, mdt,
- (CLONE_VM | CLONE_FILES));
+ (CLONE_VM | CLONE_FILES));
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->t_flags & SVC_RUNNING);
return 0;
}
thread->t_flags = 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->t_flags & SVC_STOPPED);
}