Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (57 commits)
  [GFS2] make gfs2_writepages() static
  [GFS2] Unlock page on prepare_write try lock failure
  [GFS2] nfsd readdirplus assertion failure
  [DLM] fix softlockup in dlm_recv
  [DLM] zero new user lvbs
  [DLM/GFS2] indent help text
  [GFS2] Fix unlink deadlocks
  [GFS2] Put back semaphore to avoid umount problem
  [GFS2] more CURRENT_TIME_SEC
  [GFS2/DLM] fix GFS2 circular dependency
  [GFS2/DLM] use sysfs
  [GFS2] make lock_dlm drop_count tunable in sysfs
  [GFS2] increase default lock limit
  [GFS2] Fix list corruption in lops.c
  [GFS2] Fix recursive locking attempt with NFS
  [DLM] can miss clearing resend flag
  [DLM] saved dlm message can be dropped
  [DLM] Make sock_sem into a mutex
  [GFS2] Fix typo in glock.c
  [GFS2] use CURRENT_TIME_SEC instead of get_seconds in gfs2
  ...

1 files changed, 11 insertions, 11 deletions

diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c
index 650536aa5139..3cb636d60249 100644
--- a/fs/dlm/recoverd.c
+++ b/fs/dlm/recoverd.c
@@ -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) {
-                log_error(ls, "recover_members failed %d", error);
+                log_debug(ls, "recover_members failed %d", error);
                 goto fail;
         }
         start = jiffies;
@@ -89,7 +89,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
 
         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;
         }
 
@@ -99,7 +99,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
 
         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;
         }
 
@@ -129,7 +129,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
 
                 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;
                 }
 
@@ -139,13 +139,13 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
 
                 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) {
-                        log_error(ls, "recover_locks_wait failed %d", error);
+                        log_debug(ls, "recover_locks_wait failed %d", error);
                         goto fail;
                 }
 
@@ -166,7 +166,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
 
                 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;
                 }
         }
@@ -184,7 +184,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
         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;
         }
 
@@ -192,19 +192,19 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
 
         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) {
-                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) {
-                log_error(ls, "recover_waiters_post failed %d", error);
+                log_debug(ls, "recover_waiters_post failed %d", error);
                 goto fail;
         }