Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 888334f9 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

libceph: initialize data fields on last msg put 

When the last reference to a ceph message is dropped,
ceph_msg_last_put() is called to clean things up.

For "normal" messages (allocated via ceph_msg_new() rather than
being allocated from a memory pool) it's sufficient to just release
resources.  But for a mempool-allocated message we actually have to
re-initialize the data fields in the message back to initial state
so they're ready to go in the event the message gets reused.

Some of this was already done; this fleshes it out so it's done
more completely.

This resolves:
    http://tracker.ceph.com/issues/4540



Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 7e2766a1

net/ceph/messenger.c

+6 −1
Original line number Diff line number Diff line
@@ -3331,12 +3331,17 @@ void ceph_msg_last_put(struct kref *kref) 
	if (ceph_msg_has_pages(m)) {

		m->p.length = 0;

		m->p.pages = NULL;

		m->p.type = CEPH_OSD_DATA_TYPE_NONE;

	}



	if (ceph_msg_has_pagelist(m)) {

		ceph_pagelist_release(m->l.pagelist);

		kfree(m->l.pagelist);

		m->l.pagelist = NULL;

		m->l.type = CEPH_OSD_DATA_TYPE_NONE;

	}

	if (ceph_msg_has_bio(m)) {

		m->b.bio = NULL;

		m->b.type = CEPH_OSD_DATA_TYPE_NONE;

	}



	if (m->pool)