forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ceph: only set message data pointers if non-empty

Browse source 
Change it so we only assign outgoing data information for messages
if there is outgoing data to send.

This then allows us to add a few more (currently commented-out)
assertions.

This is related to:
    http://tracker.ceph.com/issues/4284

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
This commit is contained in:
Alex Elder 2013-03-04 22:29:57 -06:00 • committed by Sage Weil
parent 27fa83852b
commit ebf18f4709
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
net/ceph/osd_client.c
View file

@ -1759,8 +1759,10 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc,
osd_data = &req->r_data_out;
if (osd_data->type == CEPH_OSD_DATA_TYPE_PAGES) {
BUG_ON(osd_data->length > (u64) SIZE_MAX);
ceph_msg_data_set_pages(req->r_request, osd_data->pages,
osd_data->length, osd_data->alignment);
if (osd_data->length)
ceph_msg_data_set_pages(req->r_request,
osd_data->pages, osd_data->length,
osd_data->alignment);
#ifdef CONFIG_BLOCK
} else if (osd_data->type == CEPH_OSD_DATA_TYPE_BIO) {
ceph_msg_data_set_bio(req->r_request, osd_data->bio);
@ -1768,7 +1770,8 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc,
} else {
BUG_ON(osd_data->type != CEPH_OSD_DATA_TYPE_NONE);
}
ceph_msg_data_set_trail(req->r_request, &req->r_trail);
if (req->r_trail.length)
ceph_msg_data_set_trail(req->r_request, &req->r_trail);
register_request(osdc, req);