1 files changed, 32 insertions, 29 deletions

diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
index ac5c616c969..64d3e2b958c 100644
--- a/fs/dlm/rcom.c
+++ b/fs/dlm/rcom.c
@@ -486,47 +486,50 @@ int dlm_send_ls_not_ready(int nodeid, struct dlm_rcom *rc_in)
         return 0;
 }
 
-static int is_old_reply(struct dlm_ls *ls, struct dlm_rcom *rc)
+/* Called by dlm_recv; corresponds to dlm_receive_message() but special
+   recovery-only comms are sent through here. */
+
+void dlm_receive_rcom(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid)
 {
+        int lock_size = sizeof(struct dlm_rcom) + sizeof(struct rcom_lock);
+        int stop, reply = 0, lock = 0;
+        uint32_t status;
         uint64_t seq;
-        int rv = 0;
 
         switch (rc->rc_type) {
+        case DLM_RCOM_LOCK:
+                lock = 1;
+                break;
+        case DLM_RCOM_LOCK_REPLY:
+                lock = 1;
+                reply = 1;
+                break;
         case DLM_RCOM_STATUS_REPLY:
         case DLM_RCOM_NAMES_REPLY:
         case DLM_RCOM_LOOKUP_REPLY:
-        case DLM_RCOM_LOCK_REPLY:
-                spin_lock(&ls->ls_recover_lock);
-                seq = ls->ls_recover_seq;
-                spin_unlock(&ls->ls_recover_lock);
-                if (rc->rc_seq_reply != seq) {
-                        log_debug(ls, "ignoring old reply %x from %d "
-                                      "seq_reply %llx expect %llx",
-                                      rc->rc_type, rc->rc_header.h_nodeid,
-                                      (unsigned long long)rc->rc_seq_reply,
-                                      (unsigned long long)seq);
-                        rv = 1;
-                }
-        }
-        return rv;
-}
-
-/* Called by dlm_recv; corresponds to dlm_receive_message() but special
-   recovery-only comms are sent through here. */
+                reply = 1;
+        };
 
-void dlm_receive_rcom(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid)
-{
-        int lock_size = sizeof(struct dlm_rcom) + sizeof(struct rcom_lock);
+        spin_lock(&ls->ls_recover_lock);
+        status = ls->ls_recover_status;
+        stop = test_bit(LSFL_RECOVERY_STOP, &ls->ls_flags);
+        seq = ls->ls_recover_seq;
+        spin_unlock(&ls->ls_recover_lock);
 
-        if (dlm_recovery_stopped(ls) && (rc->rc_type != DLM_RCOM_STATUS)) {
-                log_debug(ls, "ignoring recovery message %x from %d",
-                          rc->rc_type, nodeid);
+        if ((stop && (rc->rc_type != DLM_RCOM_STATUS)) ||
+            (reply && (rc->rc_seq_reply != seq)) ||
+            (lock && !(status & DLM_RS_DIR))) {
+                log_limit(ls, "dlm_receive_rcom ignore msg %d "
+                          "from %d %llu %llu recover seq %llu sts %x gen %u",
+                           rc->rc_type,
+                           nodeid,
+                           (unsigned long long)rc->rc_seq,
+                           (unsigned long long)rc->rc_seq_reply,
+                           (unsigned long long)seq,
+                           status, ls->ls_generation);
                 goto out;
         }
 
-        if (is_old_reply(ls, rc))
-                goto out;
-
         switch (rc->rc_type) {
         case DLM_RCOM_STATUS:
                 receive_rcom_status(ls, rc);