fs: dlm: fix return -EINTR on recovery stopped

This patch will return -EINTR instead of 1 if recovery is stopped. In
case of ping_members() the return value will be checked if the error is
-EINTR for signaling another recovery was triggered and the whole
recovery process will come to a clean end to process the next one.
Returning 1 will abort the recovery process and can leave the recovery
in a broken state.

It was reported with the following kernel log message attached and a gfs2
mount stopped working:

"dlm: bobvirt1: dlm_recover_members error 1"

whereas 1 was returned because of a conversion of "dlm_recovery_stopped()"
to an errno was missing which this patch will introduce. While on it all
other possible missing errno conversions at other places were added as
they are done as in other places.

It might be worth to check the error case at this recovery level,
because some of the functionality also returns -ENOBUFS and check why
recovery ends in a broken state. However this will fix the issue if
another recovery was triggered at some points of recovery handling.

Reported-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>

diff --git a/fs/dlm/dir.c b/fs/dlm/dir.c
index 10c36ae1a8f9a730fac4b8ba74cf4bfe15733123..45ebbe602bbf043d1c0ec9953d63192afd7a0537 100644 (file)
--- a/fs/dlm/dir.c
+++ b/fs/dlm/dir.c
@@ -85,8 +85,10 @@ int dlm_recover_directory(struct dlm_ls *ls)
                for (;;) {
                        int left;
                        error = dlm_recovery_stopped(ls);
-                       if (error)
+                       if (error) {
+                               error = -EINTR;
                                goto out_free;
+                       }
 
                        error = dlm_rcom_names(ls, memb->nodeid,
                                               last_name, last_len);

diff --git a/fs/dlm/member.c b/fs/dlm/member.c
index d9e1e4170eb153ff4cb8abb524c70dd6eea7916a..731d489aa323ed736e006d3015b32133c3e93b0c 100644 (file)
--- a/fs/dlm/member.c
+++ b/fs/dlm/member.c
@@ -443,8 +443,10 @@ static int ping_members(struct dlm_ls *ls)
 
        list_for_each_entry(memb, &ls->ls_nodes, list) {
                error = dlm_recovery_stopped(ls);
-               if (error)
+               if (error) {
+                       error = -EINTR;
                        break;
+               }
                error = dlm_rcom_status(ls, memb->nodeid, 0);
                if (error)
                        break;

diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c
index 85e24539271538668425051977069fe07a8f1b2c..97d052cea5a924e4b4efb0e66329aeaf7b8c8c74 100644 (file)
--- a/fs/dlm/recoverd.c
+++ b/fs/dlm/recoverd.c
@@ -125,8 +125,10 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
        dlm_recover_waiters_pre(ls);
 
        error = dlm_recovery_stopped(ls);
-       if (error)
+       if (error) {
+               error = -EINTR;
                goto fail;
+       }
 
        if (neg || dlm_no_directory(ls)) {
                /*