aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/dlm/dlmdomain.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 39efc5057a36..3fcf205ee900 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -1923,12 +1923,11 @@ static int dlm_join_domain(struct dlm_ctxt *dlm)
1923 goto bail; 1923 goto bail;
1924 } 1924 }
1925 1925
1926 if (total_backoff > 1926 if (total_backoff > DLM_JOIN_TIMEOUT_MSECS) {
1927 msecs_to_jiffies(DLM_JOIN_TIMEOUT_MSECS)) {
1928 status = -ERESTARTSYS; 1927 status = -ERESTARTSYS;
1929 mlog(ML_NOTICE, "Timed out joining dlm domain " 1928 mlog(ML_NOTICE, "Timed out joining dlm domain "
1930 "%s after %u msecs\n", dlm->name, 1929 "%s after %u msecs\n", dlm->name,
1931 jiffies_to_msecs(total_backoff)); 1930 total_backoff);
1932 goto bail; 1931 goto bail;
1933 } 1932 }
1934 1933