kclient: remove leaked preallocated cap releases messages

diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index f16e8b0a9faa589011cd5c6d9d6de0b9d8218ca9..c287982e7c580e5138a631eb94c90c0a62f8982d 100644 (file)
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -604,6 +604,27 @@ out:
        return 0;
 }
 
+/*
+ * Free preallocated cap messages assigned to this session
+ */
+static void cleanup_cap_releases(struct ceph_mds_session *session)
+{
+       struct ceph_msg *msg;
+
+       spin_lock(&session->s_cap_lock);
+       while (!list_empty(&session->s_cap_releases)) {
+               msg = list_first_entry(&session->s_cap_releases, struct ceph_msg,
+                                list_head);
+               ceph_msg_remove(msg);
+       }
+       while (!list_empty(&session->s_cap_releases_done)) {
+               msg = list_first_entry(&session->s_cap_releases_done, struct ceph_msg,
+                                list_head);
+               ceph_msg_remove(msg);
+       }
+       spin_unlock(&session->s_cap_lock);
+}
+
 /*
  * caller must hold session s_mutex
  */
@@ -622,6 +643,8 @@ static void remove_session_caps(struct ceph_mds_session *session)
                ceph_remove_cap(cap);
        }
        BUG_ON(session->s_nr_caps > 0);
+
+       cleanup_cap_releases(session);
 }
 
 /*

diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index 89a51876bf6bf2744fd966174ce4838b8cbcf446..934fdbbf4b6c52af45c42e1e731b7649d91eb68b 100644 (file)
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -1396,8 +1396,7 @@ static void process_ack(struct ceph_connection *con)
                        break;
                dout(5, "got ack for seq %llu type %d at %p\n", seq,
                     le16_to_cpu(m->hdr.type), m);
-               list_del_init(&m->list_head);
-               ceph_msg_put(m);
+               ceph_msg_remove(m);
        }
        spin_unlock(&con->out_queue_lock);
        prepare_read_tag(con);

diff --git a/src/kernel/messenger.h b/src/kernel/messenger.h
index 4bfccf1066f17b915cac8ed5f207ed9cff2ae6eb..7a7224a6693173027b119a717b4b06e291ef4b54 100644 (file)
--- a/src/kernel/messenger.h
+++ b/src/kernel/messenger.h
@@ -247,13 +247,18 @@ static inline struct ceph_msg *ceph_msg_get(struct ceph_msg *msg)
 
 extern void ceph_msg_put(struct ceph_msg *msg);
 
+static inline void ceph_msg_remove(struct ceph_msg *msg)
+{
+       list_del_init(&msg->list_head);
+       ceph_msg_put(msg);
+}
+
 static inline void ceph_msg_put_list(struct list_head *head)
 {
        while (!list_empty(head)) {
                struct ceph_msg *msg = list_first_entry(head, struct ceph_msg,
                                                        list_head);
-               list_del_init(&msg->list_head);
-               ceph_msg_put(msg);
+               ceph_msg_remove(msg);
        }
 }