ocfs2: remove convertion of total_backoff in dlm_join_domain()

PATCH New Xue jiufei 1 participant 1 message Jun 11, 2014 OCFS2

Share & tools

Xue jiufei

author

2014-06-11 07:27 UTC #0 lore raw

PATCH 1/1 ocfs2: remove convertion of total_backoff in dlm_join_domain()

The unit of total_backoff is msecs not jiffies, so no need to do the convertion, otherwise, the join timeout is not 90 sec.

Signed-off-by Yiwen Jiang <[email protected]>

Signed-off-by joyce.xue <[email protected]>

---
 fs/ocfs2/dlm/dlmdomain.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

fs/ocfs2/dlm/dlmdomain.c +2 -3

index 8d46907..1ac0133 100644
@@ -1923,12 +1923,11 @@ static int dlm_join_domain(struct dlm_ctxt *dlm)
 				goto bail;
 			}
 
-			if (total_backoff >
-			    msecs_to_jiffies(DLM_JOIN_TIMEOUT_MSECS)) {
+			if (total_backoff > DLM_JOIN_TIMEOUT_MSECS) {
 				status = -ERESTARTSYS;
 				mlog(ML_NOTICE, "Timed out joining dlm domain "
 				     "%s after %u msecs\n", dlm->name,
-				     jiffies_to_msecs(total_backoff));
+				     total_backoff);
 				goto bail;
 			}

Signature · 1 line

1.8.3.4