git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ide: use ide_tune_dma() part #2
[safe/jmp/linux-2.6]
/
fs
/
dlm
/
recoverd.c
diff --git
a/fs/dlm/recoverd.c
b/fs/dlm/recoverd.c
index
8bb895f
..
3cb636d
100644
(file)
--- a/
fs/dlm/recoverd.c
+++ b/
fs/dlm/recoverd.c
@@
-45,7
+45,7
@@
static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
unsigned long start;
int error, neg = 0;
unsigned long start;
int error, neg = 0;
- log_debug(ls, "recover %llx", rv->seq);
+ log_debug(ls, "recover %llx",
(unsigned long long)
rv->seq);
mutex_lock(&ls->ls_recoverd_active);
mutex_lock(&ls->ls_recoverd_active);
@@
-77,7
+77,7
@@
static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
error = dlm_recover_members(ls, rv, &neg);
if (error) {
error = dlm_recover_members(ls, rv, &neg);
if (error) {
- log_
error
(ls, "recover_members failed %d", error);
+ log_
debug
(ls, "recover_members failed %d", error);
goto fail;
}
start = jiffies;
goto fail;
}
start = jiffies;
@@
-89,25
+89,17
@@
static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
error = dlm_recover_directory(ls);
if (error) {
error = dlm_recover_directory(ls);
if (error) {
- log_
error
(ls, "recover_directory failed %d", error);
+ log_
debug
(ls, "recover_directory failed %d", error);
goto fail;
}
/*
goto fail;
}
/*
- * Purge directory-related requests that are saved in requestqueue.
- * All dir requests from before recovery are invalid now due to the dir
- * rebuild and will be resent by the requesting nodes.
- */
-
- dlm_purge_requestqueue(ls);
-
- /*
* Wait for all nodes to complete directory rebuild.
*/
error = dlm_recover_directory_wait(ls);
if (error) {
* Wait for all nodes to complete directory rebuild.
*/
error = dlm_recover_directory_wait(ls);
if (error) {
- log_
error
(ls, "recover_directory_wait failed %d", error);
+ log_
debug
(ls, "recover_directory_wait failed %d", error);
goto fail;
}
goto fail;
}
@@
-137,7
+129,7
@@
static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
error = dlm_recover_masters(ls);
if (error) {
error = dlm_recover_masters(ls);
if (error) {
- log_
error
(ls, "recover_masters failed %d", error);
+ log_
debug
(ls, "recover_masters failed %d", error);
goto fail;
}
goto fail;
}
@@
-147,13
+139,13
@@
static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
error = dlm_recover_locks(ls);
if (error) {
error = dlm_recover_locks(ls);
if (error) {
- log_
error
(ls, "recover_locks failed %d", error);
+ log_
debug
(ls, "recover_locks failed %d", error);
goto fail;
}
error = dlm_recover_locks_wait(ls);
if (error) {
goto fail;
}
error = dlm_recover_locks_wait(ls);
if (error) {
- log_
error
(ls, "recover_locks_wait failed %d", error);
+ log_
debug
(ls, "recover_locks_wait failed %d", error);
goto fail;
}
goto fail;
}
@@
-174,17
+166,25
@@
static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
error = dlm_recover_locks_wait(ls);
if (error) {
error = dlm_recover_locks_wait(ls);
if (error) {
- log_
error
(ls, "recover_locks_wait failed %d", error);
+ log_
debug
(ls, "recover_locks_wait failed %d", error);
goto fail;
}
}
dlm_release_root_list(ls);
goto fail;
}
}
dlm_release_root_list(ls);
+ /*
+ * Purge directory-related requests that are saved in requestqueue.
+ * All dir requests from before recovery are invalid now due to the dir
+ * rebuild and will be resent by the requesting nodes.
+ */
+
+ dlm_purge_requestqueue(ls);
+
dlm_set_recover_status(ls, DLM_RS_DONE);
error = dlm_recover_done_wait(ls);
if (error) {
dlm_set_recover_status(ls, DLM_RS_DONE);
error = dlm_recover_done_wait(ls);
if (error) {
- log_
error
(ls, "recover_done_wait failed %d", error);
+ log_
debug
(ls, "recover_done_wait failed %d", error);
goto fail;
}
goto fail;
}
@@
-192,19
+192,19
@@
static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
error = enable_locking(ls, rv->seq);
if (error) {
error = enable_locking(ls, rv->seq);
if (error) {
- log_
error
(ls, "enable_locking failed %d", error);
+ log_
debug
(ls, "enable_locking failed %d", error);
goto fail;
}
error = dlm_process_requestqueue(ls);
if (error) {
goto fail;
}
error = dlm_process_requestqueue(ls);
if (error) {
- log_
error
(ls, "process_requestqueue failed %d", error);
+ log_
debug
(ls, "process_requestqueue failed %d", error);
goto fail;
}
error = dlm_recover_waiters_post(ls);
if (error) {
goto fail;
}
error = dlm_recover_waiters_post(ls);
if (error) {
- log_
error
(ls, "recover_waiters_post failed %d", error);
+ log_
debug
(ls, "recover_waiters_post failed %d", error);
goto fail;
}
goto fail;
}
@@
-212,7
+212,8
@@
static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
dlm_astd_wake();
dlm_astd_wake();
- log_debug(ls, "recover %llx done: %u ms", rv->seq,
+ log_debug(ls, "recover %llx done: %u ms",
+ (unsigned long long)rv->seq,
jiffies_to_msecs(jiffies - start));
mutex_unlock(&ls->ls_recoverd_active);
jiffies_to_msecs(jiffies - start));
mutex_unlock(&ls->ls_recoverd_active);
@@
-220,7
+221,8
@@
static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
fail:
dlm_release_root_list(ls);
fail:
dlm_release_root_list(ls);
- log_debug(ls, "recover %llx error %d", rv->seq, error);
+ log_debug(ls, "recover %llx error %d",
+ (unsigned long long)rv->seq, error);
mutex_unlock(&ls->ls_recoverd_active);
return error;
}
mutex_unlock(&ls->ls_recoverd_active);
return error;
}