Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7567c148 authored by Xue jiufei's avatar Xue jiufei Committed by Linus Torvalds
Browse files

ocfs2: remove conversion of total_backoff in dlm_join_domain() 



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

Signed-off-by: default avatarYiwen Jiang <jiangyiwen@huawei.com>
Signed-off-by: default avatarjoyce.xue <xuejiufei@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 981035b4

fs/ocfs2/dlm/dlmdomain.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

			}