From a5fa9e2c2dc615ae0b42348874e917578d714c94 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Wed, 13 Mar 2013 20:50:01 -0500 Subject: [PATCH] --- yaml --- r: 373399 b: refs/heads/master c: b0270324c5a9a5157f565c2de34fb1071cfdce7c h: refs/heads/master i: 373397: 4471c6d7fdcef253f352b202cba17249ba3e22a1 373395: 15114b306b769c8b90c792f84bab5b1fe48e16e0 373391: abbc31095c8c0c5af6929d929a2bf9f3277c128d v: v3 --- [refs] | 2 +- trunk/net/ceph/osd_client.c | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 68518f3b5a56..7db57b36af10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d18d1e2807f38a94839be1f83682e17011f53322 +refs/heads/master: b0270324c5a9a5157f565c2de34fb1071cfdce7c diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c index 7136060a0501..55f7c9a57a43 100644 --- a/trunk/net/ceph/osd_client.c +++ b/trunk/net/ceph/osd_client.c @@ -581,17 +581,10 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, truncate_size = object_size; } - memset(&ops, 0, sizeof ops); - ops[0].op = opcode; - ops[0].extent.offset = objoff; - ops[0].extent.length = objlen; - ops[0].extent.truncate_size = truncate_size; - ops[0].extent.truncate_seq = truncate_seq; - if (ops[0].op == CEPH_OSD_OP_WRITE) - ops[0].payload_len = *plen; - + osd_req_op_extent_init(&ops[0], opcode, objoff, objlen, + truncate_size, truncate_seq); if (do_sync) - ops[1].op = CEPH_OSD_OP_STARTSYNC; + osd_req_op_init(&ops[1], CEPH_OSD_OP_STARTSYNC); req->r_file_layout = *layout; /* keep a copy */