diff options
Diffstat (limited to 'fs/dlm/recoverd.c')
-rw-r--r-- | fs/dlm/recoverd.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c index 32f9f8926ec3..6859b4bf971e 100644 --- a/fs/dlm/recoverd.c +++ b/fs/dlm/recoverd.c | |||
@@ -55,7 +55,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
55 | unsigned long start; | 55 | unsigned long start; |
56 | int error, neg = 0; | 56 | int error, neg = 0; |
57 | 57 | ||
58 | log_debug(ls, "dlm_recover %llu", (unsigned long long)rv->seq); | 58 | log_rinfo(ls, "dlm_recover %llu", (unsigned long long)rv->seq); |
59 | 59 | ||
60 | mutex_lock(&ls->ls_recoverd_active); | 60 | mutex_lock(&ls->ls_recoverd_active); |
61 | 61 | ||
@@ -76,7 +76,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
76 | 76 | ||
77 | error = dlm_recover_members(ls, rv, &neg); | 77 | error = dlm_recover_members(ls, rv, &neg); |
78 | if (error) { | 78 | if (error) { |
79 | log_debug(ls, "dlm_recover_members error %d", error); | 79 | log_rinfo(ls, "dlm_recover_members error %d", error); |
80 | goto fail; | 80 | goto fail; |
81 | } | 81 | } |
82 | 82 | ||
@@ -90,7 +90,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
90 | 90 | ||
91 | error = dlm_recover_members_wait(ls); | 91 | error = dlm_recover_members_wait(ls); |
92 | if (error) { | 92 | if (error) { |
93 | log_debug(ls, "dlm_recover_members_wait error %d", error); | 93 | log_rinfo(ls, "dlm_recover_members_wait error %d", error); |
94 | goto fail; | 94 | goto fail; |
95 | } | 95 | } |
96 | 96 | ||
@@ -103,7 +103,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
103 | 103 | ||
104 | error = dlm_recover_directory(ls); | 104 | error = dlm_recover_directory(ls); |
105 | if (error) { | 105 | if (error) { |
106 | log_debug(ls, "dlm_recover_directory error %d", error); | 106 | log_rinfo(ls, "dlm_recover_directory error %d", error); |
107 | goto fail; | 107 | goto fail; |
108 | } | 108 | } |
109 | 109 | ||
@@ -111,11 +111,11 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
111 | 111 | ||
112 | error = dlm_recover_directory_wait(ls); | 112 | error = dlm_recover_directory_wait(ls); |
113 | if (error) { | 113 | if (error) { |
114 | log_debug(ls, "dlm_recover_directory_wait error %d", error); | 114 | log_rinfo(ls, "dlm_recover_directory_wait error %d", error); |
115 | goto fail; | 115 | goto fail; |
116 | } | 116 | } |
117 | 117 | ||
118 | log_debug(ls, "dlm_recover_directory %u out %u messages", | 118 | log_rinfo(ls, "dlm_recover_directory %u out %u messages", |
119 | ls->ls_recover_dir_sent_res, ls->ls_recover_dir_sent_msg); | 119 | ls->ls_recover_dir_sent_res, ls->ls_recover_dir_sent_msg); |
120 | 120 | ||
121 | /* | 121 | /* |
@@ -144,7 +144,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
144 | 144 | ||
145 | error = dlm_recover_masters(ls); | 145 | error = dlm_recover_masters(ls); |
146 | if (error) { | 146 | if (error) { |
147 | log_debug(ls, "dlm_recover_masters error %d", error); | 147 | log_rinfo(ls, "dlm_recover_masters error %d", error); |
148 | goto fail; | 148 | goto fail; |
149 | } | 149 | } |
150 | 150 | ||
@@ -154,7 +154,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
154 | 154 | ||
155 | error = dlm_recover_locks(ls); | 155 | error = dlm_recover_locks(ls); |
156 | if (error) { | 156 | if (error) { |
157 | log_debug(ls, "dlm_recover_locks error %d", error); | 157 | log_rinfo(ls, "dlm_recover_locks error %d", error); |
158 | goto fail; | 158 | goto fail; |
159 | } | 159 | } |
160 | 160 | ||
@@ -162,11 +162,11 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
162 | 162 | ||
163 | error = dlm_recover_locks_wait(ls); | 163 | error = dlm_recover_locks_wait(ls); |
164 | if (error) { | 164 | if (error) { |
165 | log_debug(ls, "dlm_recover_locks_wait error %d", error); | 165 | log_rinfo(ls, "dlm_recover_locks_wait error %d", error); |
166 | goto fail; | 166 | goto fail; |
167 | } | 167 | } |
168 | 168 | ||
169 | log_debug(ls, "dlm_recover_locks %u in", | 169 | log_rinfo(ls, "dlm_recover_locks %u in", |
170 | ls->ls_recover_locks_in); | 170 | ls->ls_recover_locks_in); |
171 | 171 | ||
172 | /* | 172 | /* |
@@ -186,7 +186,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
186 | 186 | ||
187 | error = dlm_recover_locks_wait(ls); | 187 | error = dlm_recover_locks_wait(ls); |
188 | if (error) { | 188 | if (error) { |
189 | log_debug(ls, "dlm_recover_locks_wait error %d", error); | 189 | log_rinfo(ls, "dlm_recover_locks_wait error %d", error); |
190 | goto fail; | 190 | goto fail; |
191 | } | 191 | } |
192 | } | 192 | } |
@@ -205,7 +205,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
205 | 205 | ||
206 | error = dlm_recover_done_wait(ls); | 206 | error = dlm_recover_done_wait(ls); |
207 | if (error) { | 207 | if (error) { |
208 | log_debug(ls, "dlm_recover_done_wait error %d", error); | 208 | log_rinfo(ls, "dlm_recover_done_wait error %d", error); |
209 | goto fail; | 209 | goto fail; |
210 | } | 210 | } |
211 | 211 | ||
@@ -217,25 +217,25 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
217 | 217 | ||
218 | error = enable_locking(ls, rv->seq); | 218 | error = enable_locking(ls, rv->seq); |
219 | if (error) { | 219 | if (error) { |
220 | log_debug(ls, "enable_locking error %d", error); | 220 | log_rinfo(ls, "enable_locking error %d", error); |
221 | goto fail; | 221 | goto fail; |
222 | } | 222 | } |
223 | 223 | ||
224 | error = dlm_process_requestqueue(ls); | 224 | error = dlm_process_requestqueue(ls); |
225 | if (error) { | 225 | if (error) { |
226 | log_debug(ls, "dlm_process_requestqueue error %d", error); | 226 | log_rinfo(ls, "dlm_process_requestqueue error %d", error); |
227 | goto fail; | 227 | goto fail; |
228 | } | 228 | } |
229 | 229 | ||
230 | error = dlm_recover_waiters_post(ls); | 230 | error = dlm_recover_waiters_post(ls); |
231 | if (error) { | 231 | if (error) { |
232 | log_debug(ls, "dlm_recover_waiters_post error %d", error); | 232 | log_rinfo(ls, "dlm_recover_waiters_post error %d", error); |
233 | goto fail; | 233 | goto fail; |
234 | } | 234 | } |
235 | 235 | ||
236 | dlm_recover_grant(ls); | 236 | dlm_recover_grant(ls); |
237 | 237 | ||
238 | log_debug(ls, "dlm_recover %llu generation %u done: %u ms", | 238 | log_rinfo(ls, "dlm_recover %llu generation %u done: %u ms", |
239 | (unsigned long long)rv->seq, ls->ls_generation, | 239 | (unsigned long long)rv->seq, ls->ls_generation, |
240 | jiffies_to_msecs(jiffies - start)); | 240 | jiffies_to_msecs(jiffies - start)); |
241 | mutex_unlock(&ls->ls_recoverd_active); | 241 | mutex_unlock(&ls->ls_recoverd_active); |
@@ -245,7 +245,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) | |||
245 | 245 | ||
246 | fail: | 246 | fail: |
247 | dlm_release_root_list(ls); | 247 | dlm_release_root_list(ls); |
248 | log_debug(ls, "dlm_recover %llu error %d", | 248 | log_rinfo(ls, "dlm_recover %llu error %d", |
249 | (unsigned long long)rv->seq, error); | 249 | (unsigned long long)rv->seq, error); |
250 | mutex_unlock(&ls->ls_recoverd_active); | 250 | mutex_unlock(&ls->ls_recoverd_active); |
251 | return error; | 251 | return error; |