* 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 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));
return rc;
}
- l_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);
- l_cfs_wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_STOPPED);
+ l_wait_condition(thread->t_ctl_waitq, thread->t_flags & SVC_STOPPED);
}