NFSv4: Fix a dentry leak on alias use

[firefly-linux-kernel-4.4.55.git] / fs / dlm / requestqueue.c

diff --git a/fs/dlm/requestqueue.c b/fs/dlm/requestqueue.c
index a44fa22890e1dd06797ae5e43e77a86c0cf4ca63..1695f1b0dd456f84c0a4c989069296629b5ea37a 100644 (file)
--- a/fs/dlm/requestqueue.c
+++ b/fs/dlm/requestqueue.c
@@ -19,6 +19,7 @@
 
 struct rq_entry {
        struct list_head list;
+       uint32_t recover_seq;
        int nodeid;
        struct dlm_message request;
 };
@@ -41,6 +42,7 @@ void dlm_add_requestqueue(struct dlm_ls *ls, int nodeid, struct dlm_message *ms)
                return;
        }
 
+       e->recover_seq = ls->ls_recover_seq & 0xFFFFFFFF;
        e->nodeid = nodeid;
        memcpy(&e->request, ms, ms->m_header.h_length);
 
@@ -63,6 +65,7 @@ void dlm_add_requestqueue(struct dlm_ls *ls, int nodeid, struct dlm_message *ms)
 int dlm_process_requestqueue(struct dlm_ls *ls)
 {
        struct rq_entry *e;
+       struct dlm_message *ms;
        int error = 0;
 
        mutex_lock(&ls->ls_requestqueue_mutex);
@@ -76,7 +79,15 @@ int dlm_process_requestqueue(struct dlm_ls *ls)
                e = list_entry(ls->ls_requestqueue.next, struct rq_entry, list);
                mutex_unlock(&ls->ls_requestqueue_mutex);
 
-               dlm_receive_message_saved(ls, &e->request);
+               ms = &e->request;
+
+               log_limit(ls, "dlm_process_requestqueue msg %d from %d "
+                         "lkid %x remid %x result %d seq %u",
+                         ms->m_type, ms->m_header.h_nodeid,
+                         ms->m_lkid, ms->m_remid, ms->m_result,
+                         e->recover_seq);
+
+               dlm_receive_message_saved(ls, &e->request, e->recover_seq);
 
                mutex_lock(&ls->ls_requestqueue_mutex);
                list_del(&e->list);
@@ -138,35 +149,7 @@ static int purge_request(struct dlm_ls *ls, struct dlm_message *ms, int nodeid)
        if (!dlm_no_directory(ls))
                return 0;
 
-       /* with no directory, the master is likely to change as a part of
-          recovery; requests to/from the defunct master need to be purged */
-
-       switch (type) {
-       case DLM_MSG_REQUEST:
-       case DLM_MSG_CONVERT:
-       case DLM_MSG_UNLOCK:
-       case DLM_MSG_CANCEL:
-               /* we're no longer the master of this resource, the sender
-                  will resend to the new master (see waiter_needs_recovery) */
-
-               if (dlm_hash2nodeid(ls, ms->m_hash) != dlm_our_nodeid())
-                       return 1;
-               break;
-
-       case DLM_MSG_REQUEST_REPLY:
-       case DLM_MSG_CONVERT_REPLY:
-       case DLM_MSG_UNLOCK_REPLY:
-       case DLM_MSG_CANCEL_REPLY:
-       case DLM_MSG_GRANT:
-               /* this reply is from the former master of the resource,
-                  we'll resend to the new master if needed */
-
-               if (dlm_hash2nodeid(ls, ms->m_hash) != nodeid)
-                       return 1;
-               break;
-       }
-
-       return 0;
+       return 1;
 }
 
 void dlm_purge_requestqueue(struct dlm_ls *ls)