From dece5ab71646bad0ec64ad0e4f9fa2576f33d10f Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Mon, 25 Mar 2013 11:54:30 -0500 Subject: [PATCH] --- yaml --- r: 373374 b: refs/heads/master c: 888334f966fab232fe9158c2c2f0a935e356b583 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ceph/messenger.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 752f4ac86ad3..650e26007202 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e2766a1135544a2972d2767f3a41afd5f55067f +refs/heads/master: 888334f966fab232fe9158c2c2f0a935e356b583 diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c index 2aecc4896a03..0a9f6362d4d8 100644 --- a/trunk/net/ceph/messenger.c +++ b/trunk/net/ceph/messenger.c @@ -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)