From: Mr NeilBrown Date: Thu, 29 Aug 2019 00:05:04 +0000 (+1000) Subject: LU-10467 lustre: use TABs for indents in a few places. X-Git-Tag: 2.12.90~123 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=c71c6d786cbee5341e37b1eec13e9f06e49ca37a;hp=7404a3e355eeed661c6ee669c05d9e6a24ed592f;p=fs%2Flustre-release.git LU-10467 lustre: use TABs for indents in a few places. Each of the functions changed here will have code changes in the next patch, so fix up all the indentation first. Test-Parameters: trivial Signed-off-by: Mr NeilBrown Change-Id: Ib10e999a8c58eb96d3312878be91b465da3a2df8 Reviewed-on: https://review.whamcloud.com/35970 Reviewed-by: James Simmons Reviewed-by: Arshad Hussain Reviewed-by: Shaun Tancheff Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c index 5baae7b..3e64224 100644 --- a/lustre/ldlm/ldlm_lock.c +++ b/lustre/ldlm/ldlm_lock.c @@ -2408,13 +2408,13 @@ void ldlm_cancel_callback(struct ldlm_lock *lock) if (!ldlm_is_cancel(lock)) { ldlm_set_cancel(lock); if (lock->l_blocking_ast) { - unlock_res_and_lock(lock); - lock->l_blocking_ast(lock, NULL, lock->l_ast_data, - LDLM_CB_CANCELING); - lock_res_and_lock(lock); - } else { - LDLM_DEBUG(lock, "no blocking ast"); - } + unlock_res_and_lock(lock); + lock->l_blocking_ast(lock, NULL, lock->l_ast_data, + LDLM_CB_CANCELING); + lock_res_and_lock(lock); + } else { + LDLM_DEBUG(lock, "no blocking ast"); + } /* only canceller can set bl_done bit */ ldlm_set_bl_done(lock); diff --git a/lustre/lfsck/lfsck_layout.c b/lustre/lfsck/lfsck_layout.c index 33563da..c66358e 100644 --- a/lustre/lfsck/lfsck_layout.c +++ b/lustre/lfsck/lfsck_layout.c @@ -5356,7 +5356,7 @@ static int lfsck_layout_scan_stripes(const struct lu_env *env, struct dt_object *parent, struct lov_mds_md_v1 *lmm, __u32 comp_id) { - struct lfsck_thread_info *info = lfsck_env_info(env); + struct lfsck_thread_info *info = lfsck_env_info(env); struct lfsck_instance *lfsck = com->lc_lfsck; struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram; struct lfsck_layout *lo = com->lc_file_ram; diff --git a/lustre/llite/statahead.c b/lustre/llite/statahead.c index 92c7ca8..9317eeb 100644 --- a/lustre/llite/statahead.c +++ b/lustre/llite/statahead.c @@ -891,7 +891,6 @@ static int ll_agl_thread(void *arg) struct l_wait_info lwi = { 0 }; ENTRY; - sai = ll_sai_get(dir); thread = &sai->sai_agl_thread; thread->t_pid = current_pid(); @@ -909,14 +908,13 @@ static int ll_agl_thread(void *arg) spin_unlock(&plli->lli_agl_lock); wake_up(&thread->t_ctl_waitq); - while (1) { - l_wait_event(thread->t_ctl_waitq, - !agl_list_empty(sai) || - !thread_is_running(thread), - &lwi); - + while (1) { + l_wait_event(thread->t_ctl_waitq, + !agl_list_empty(sai) || + !thread_is_running(thread), + &lwi); if (!thread_is_running(thread)) - break; + break; spin_lock(&plli->lli_agl_lock); /* The statahead thread maybe help to process AGL entries, diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c index 6617160..40eab2e 100644 --- a/lustre/mgc/mgc_request.c +++ b/lustre/mgc/mgc_request.c @@ -647,15 +647,15 @@ static int mgc_requeue_thread(void *data) l_wait_event(rq_waitq, rq_state & (RQ_STOP | RQ_PRECLEANUP), &lwi); - /* - * iterate & processing through the list. for each cld, process - * its depending sptlrpc cld firstly (if any) and then itself. - * - * it's guaranteed any item in the list must have - * reference > 0; and if cld_lostlock is set, at - * least one reference is taken by the previous enqueue. - */ - cld_prev = NULL; + /* + * iterate & processing through the list. for each cld, process + * its depending sptlrpc cld firstly (if any) and then itself. + * + * it's guaranteed any item in the list must have + * reference > 0; and if cld_lostlock is set, at + * least one reference is taken by the previous enqueue. + */ + cld_prev = NULL; spin_lock(&config_list_lock); rq_state &= ~RQ_PRECLEANUP;