From d87a34a11ddca0659ce2a1fc3d0dbfab9a7d4625 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Thu, 29 Aug 2019 10:21:56 +1000 Subject: [PATCH] LU-10467 ptlrpc: fix indents in ptlrpc_recover_import() Next patch will make code changes in ptlrpc_recover_import(), so fix up indenting to use TABs first. Test-Parameters: trivial Signed-off-by: Mr NeilBrown Change-Id: I1d839e3087a5d12473b0428509455dbbb4b5d9e8 Reviewed-on: https://review.whamcloud.com/35976 Reviewed-by: Arshad Hussain Reviewed-by: Shaun Tancheff Reviewed-by: James Simmons Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/ptlrpc/recover.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lustre/ptlrpc/recover.c b/lustre/ptlrpc/recover.c index 35c4a5e..ce460934 100644 --- a/lustre/ptlrpc/recover.c +++ b/lustre/ptlrpc/recover.c @@ -328,39 +328,39 @@ int ptlrpc_recover_import(struct obd_import *imp, char *new_uuid, int async) GOTO(out, rc); } - /* Check if reconnect is already in progress */ + /* Check if reconnect is already in progress */ spin_lock(&imp->imp_lock); if (imp->imp_state != LUSTRE_IMP_DISCON) { imp->imp_force_verify = 1; rc = -EALREADY; } spin_unlock(&imp->imp_lock); - if (rc) - GOTO(out, rc); + if (rc) + GOTO(out, rc); OBD_RACE(OBD_FAIL_PTLRPC_CONNECT_RACE); - rc = ptlrpc_connect_import(imp); - if (rc) - GOTO(out, rc); + rc = ptlrpc_connect_import(imp); + if (rc) + GOTO(out, rc); - if (!async) { - struct l_wait_info lwi; + if (!async) { + struct l_wait_info lwi; long secs = cfs_time_seconds(obd_timeout); CDEBUG(D_HA, "%s: recovery started, waiting %lu seconds\n", - obd2cli_tgt(imp->imp_obd), secs); + obd2cli_tgt(imp->imp_obd), secs); - lwi = LWI_TIMEOUT(secs, NULL, NULL); - rc = l_wait_event(imp->imp_recovery_waitq, - !ptlrpc_import_in_recovery(imp), &lwi); - CDEBUG(D_HA, "%s: recovery finished\n", - obd2cli_tgt(imp->imp_obd)); - } - EXIT; + lwi = LWI_TIMEOUT(secs, NULL, NULL); + rc = l_wait_event(imp->imp_recovery_waitq, + !ptlrpc_import_in_recovery(imp), &lwi); + CDEBUG(D_HA, "%s: recovery finished\n", + obd2cli_tgt(imp->imp_obd)); + } + EXIT; out: - return rc; + return rc; } EXPORT_SYMBOL(ptlrpc_recover_import); -- 1.8.3.1