X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_reint.c;h=d9a55370457224108c92b9cc2d93633c73b09c30;hp=c914f18cc527bc7e7849b69b7b8c2b733ac7a4c6;hb=2104ed0f0da3651f0cb4ab0c78a1037891d7cb4f;hpb=11db1a551172f596d1d284e8496530f9ce24ac81 diff --git a/lustre/quota/qsd_reint.c b/lustre/quota/qsd_reint.c index c914f18..d9a5537 100644 --- a/lustre/quota/qsd_reint.c +++ b/lustre/quota/qsd_reint.c @@ -21,7 +21,7 @@ * GPL HEADER END */ /* - * Copyright (c) 2012, 2013, Intel Corporation. + * Copyright (c) 2012, 2014, Intel Corporation. * Use is subject to license terms. * * Author: Johann Lombardi @@ -30,6 +30,8 @@ #define DEBUG_SUBSYSTEM S_LQUOTA +#include +#include #include "qsd_internal.h" /* @@ -194,14 +196,14 @@ static int qsd_reint_index(const struct lu_env *env, struct qsd_qtype_info *qqi, /* let's do a 1MB bulk */ npages = min_t(unsigned int, OFD_MAX_BRW_SIZE, 1 << 20); - npages /= PAGE_CACHE_SIZE; + npages /= PAGE_SIZE; /* allocate pages for bulk index read */ OBD_ALLOC(pages, npages * sizeof(*pages)); if (pages == NULL) GOTO(out, rc = -ENOMEM); for (i = 0; i < npages; i++) { - pages[i] = alloc_page(GFP_IOFS); + pages[i] = alloc_page(GFP_NOFS); if (pages[i] == NULL) GOTO(out, rc = -ENOMEM); } @@ -254,7 +256,7 @@ repeat: ver = ii->ii_version; pg_cnt = (ii->ii_count + (LU_PAGE_COUNT) - 1); - pg_cnt >>= PAGE_CACHE_SHIFT - LU_PAGE_SHIFT; + pg_cnt >>= PAGE_SHIFT - LU_PAGE_SHIFT; if (pg_cnt > npages) { CERROR("%s: master returned more pages than expected, %u > %u" @@ -305,7 +307,7 @@ static int qsd_reconciliation(const struct lu_env *env, LASSERT(qqi->qqi_glb_obj != NULL); iops = &qqi->qqi_glb_obj->do_index_ops->dio_it; - it = iops->init(env, qqi->qqi_glb_obj, 0, BYPASS_CAPA); + it = iops->init(env, qqi->qqi_glb_obj, 0); if (IS_ERR(it)) { CWARN("%s: Initialize it for "DFID" failed. %ld\n", qsd->qsd_svname, PFID(&qqi->qqi_fid), PTR_ERR(it)); @@ -420,7 +422,7 @@ static int qsd_reint_main(void *args) lu_ref_add(&qqi->qqi_reference, "reint_thread", thread); thread_set_flags(thread, SVC_RUNNING); - cfs_waitq_signal(&thread->t_ctl_waitq); + wake_up(&thread->t_ctl_waitq); OBD_ALLOC_PTR(env); if (env == NULL) @@ -497,7 +499,7 @@ static int qsd_reint_main(void *args) if (qqi->qqi_slv_ver != qti->qti_slv_ver) { rc = qsd_reint_index(env, qqi, false); if (rc) { - CWARN("%s: Reint slave for "DFID" failed. %d\n", + CWARN("%s: reintegration for "DFID" failed with %d\n", qsd->qsd_svname, PFID(&qqi->qqi_slv_fid), rc); GOTO(out_lock, rc); } @@ -515,8 +517,8 @@ static int qsd_reint_main(void *args) /* Step 4: start reconciliation for each enforced ID */ rc = qsd_reconciliation(env, qqi); if (rc) - CWARN("%s: reconciliation failed. "DFID", %d\n", - qsd->qsd_svname, PFID(&qti->qti_fid), rc); + CWARN("%s: reconciliation for "DFID" failed with %d\n", + qsd->qsd_svname, PFID(&qqi->qqi_slv_fid), rc); EXIT; out_lock: @@ -530,11 +532,12 @@ out: qqi->qqi_reint = 0; write_unlock(&qsd->qsd_lock); - qqi_putref(qqi); + thread_set_flags(thread, SVC_STOPPED); + wake_up(&thread->t_ctl_waitq); + lu_ref_del(&qqi->qqi_reference, "reint_thread", thread); + qqi_putref(qqi); - thread_set_flags(thread, SVC_STOPPED); - cfs_waitq_signal(&thread->t_ctl_waitq); return rc; } @@ -545,20 +548,20 @@ void qsd_stop_reint_thread(struct qsd_qtype_info *qqi) if (!thread_is_stopped(thread)) { thread_set_flags(thread, SVC_STOPPING); - cfs_waitq_signal(&thread->t_ctl_waitq); + wake_up(&thread->t_ctl_waitq); l_wait_event(thread->t_ctl_waitq, thread_is_stopped(thread), &lwi); } } -static int qsd_entry_iter_cb(cfs_hash_t *hs, cfs_hash_bd_t *bd, - cfs_hlist_node_t *hnode, void *data) +static int qsd_entry_iter_cb(struct cfs_hash *hs, struct cfs_hash_bd *bd, + struct hlist_node *hnode, void *data) { struct lquota_entry *lqe; int *pending = (int *)data; - lqe = cfs_hlist_entry(hnode, struct lquota_entry, lqe_hash); + lqe = hlist_entry(hnode, struct lquota_entry, lqe_hash); LASSERT(atomic_read(&lqe->lqe_ref) > 0); lqe_read_lock(lqe); @@ -579,9 +582,9 @@ static bool qsd_pending_updates(struct qsd_qtype_info *qqi) /* any pending quota adjust? */ spin_lock(&qsd->qsd_adjust_lock); - cfs_list_for_each_entry_safe(lqe, n, &qsd->qsd_adjust_list, lqe_link) { + list_for_each_entry_safe(lqe, n, &qsd->qsd_adjust_list, lqe_link) { if (lqe2qqi(lqe) == qqi) { - cfs_list_del_init(&lqe->lqe_link); + list_del_init(&lqe->lqe_link); lqe_putref(lqe); } } @@ -589,7 +592,7 @@ static bool qsd_pending_updates(struct qsd_qtype_info *qqi) /* any pending updates? */ read_lock(&qsd->qsd_lock); - cfs_list_for_each_entry(upd, &qsd->qsd_upd_list, qur_link) { + list_for_each_entry(upd, &qsd->qsd_upd_list, qur_link) { if (upd->qur_qqi == qqi) { read_unlock(&qsd->qsd_lock); CDEBUG(D_QUOTA, "%s: pending %s updates for type:%d.\n", @@ -623,6 +626,7 @@ int qsd_start_reint_thread(struct qsd_qtype_info *qqi) struct ptlrpc_thread *thread = &qqi->qqi_reint_thread; struct qsd_instance *qsd = qqi->qqi_qsd; struct l_wait_info lwi = { 0 }; + struct task_struct *task; int rc; char *name; ENTRY; @@ -664,10 +668,11 @@ int qsd_start_reint_thread(struct qsd_qtype_info *qqi) snprintf(name, MTI_NAME_MAXLEN, "qsd_reint_%d.%s", qqi->qqi_qtype, qsd->qsd_svname); - rc = PTR_ERR(kthread_run(qsd_reint_main, (void *)qqi, name)); + task = kthread_run(qsd_reint_main, qqi, name); OBD_FREE(name, MTI_NAME_MAXLEN); - if (IS_ERR_VALUE(rc)) { + if (IS_ERR(task)) { + rc = PTR_ERR(task); thread_set_flags(thread, SVC_STOPPED); write_lock(&qsd->qsd_lock); qqi->qqi_reint = 0;