spin_lock(&cli->cl_loi_list_lock);
if (cli->cl_r_in_flight >= cli->cl_max_rpcs_in_flight) {
list_add_tail(&mcw.mcw_entry, &cli->cl_cache_waiters);
- init_waitqueue_head(&mcw.mcw_waitq);
+ cfs_waitq_init(&mcw.mcw_waitq);
spin_unlock(&cli->cl_loi_list_lock);
l_wait_event(mcw.mcw_waitq, fld_req_avail(cli, &mcw), &lwi);
} else {
mcw = list_entry(l, struct mdc_cache_waiter, mcw_entry);
list_del_init(&mcw->mcw_entry);
cli->cl_r_in_flight++;
- wake_up(&mcw->mcw_waitq);
+ cfs_waitq_signal(&mcw->mcw_waitq);
}
spin_unlock(&cli->cl_loi_list_lock);
}
#endif /* __KERNEL__ */
+
#define l_wait_event(wq, condition, info) \
({ \
int __ret; \
__ret; \
})
+#define cfs_wait_event(wq, condition) \
+({ \
+ int __ret; \
+ \
+ struct l_wait_info lwi = { 0 }; \
+ l_wait_event(wq, condition, &lwi); \
+ __ret; \
+})
+
#ifdef __KERNEL__
#define LIBLUSTRE_CLIENT (0)
#else
spin_lock(&cli->cl_loi_list_lock);
if (cli->cl_r_in_flight >= cli->cl_max_rpcs_in_flight) {
list_add_tail(&mcw.mcw_entry, &cli->cl_cache_waiters);
- init_waitqueue_head(&mcw.mcw_waitq);
+ cfs_waitq_init(&mcw.mcw_waitq);
spin_unlock(&cli->cl_loi_list_lock);
l_wait_event(mcw.mcw_waitq, mdc_req_avail(cli, &mcw), &lwi);
} else {
mcw = list_entry(l, struct mdc_cache_waiter, mcw_entry);
list_del_init(&mcw->mcw_entry);
cli->cl_r_in_flight++;
- wake_up(&mcw->mcw_waitq);
+ cfs_waitq_signal(&mcw->mcw_waitq);
}
/* Empty waiting list? Decrease reqs in-flight number */
int rc;
cfs_waitq_init(&thread->t_ctl_waitq);
- rc = kernel_thread(mdt_ck_thread_main, mdt,
+ rc = cfs_kernel_thread(mdt_ck_thread_main, mdt,
(CLONE_VM | CLONE_FILES));
if (rc < 0) {
CERROR("cannot start mdt_ck thread, rc = %d\n", rc);
return rc;
}
- wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_RUNNING);
+ cfs_wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_RUNNING);
return 0;
}
thread->t_flags = SVC_STOPPING;
cfs_waitq_signal(&thread->t_ctl_waitq);
- wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_STOPPED);
+ cfs_wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_STOPPED);
}
cleanup_lwi:
OBD_FREE_PTR(lwi);
cleanup_page:
- __cfs_free_page(page);
+ cfs_free_page(page);
desc_cleanup:
ptlrpc_free_bulk(desc);
RETURN(rc);
for (i = 0; i < rdpg->rp_npages; i++)
if (rdpg->rp_pages[i] != NULL)
- __cfs_free_page(rdpg->rp_pages[i]);
+ cfs_free_page(rdpg->rp_pages[i]);
OBD_FREE(rdpg->rp_pages, rdpg->rp_npages * sizeof rdpg->rp_pages[0]);
if (OBD_FAIL_CHECK(OBD_FAIL_MDS_SENDPAGE))