From 567fc2766af5aea20b2a84a2e7348bf6e2eb169e Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Wed, 11 May 2011 16:23:39 -0400 Subject: [PATCH] --- yaml --- r: 251255 b: refs/heads/master c: 68c88dd7d3caf1737112238fbe91cccd8e7a69fc h: refs/heads/master i: 251253: f31f40dc94c24ce387336bd3fd1c8297af6a35e7 251251: 677ef2fc48662d40d95258340f52c0d62341f0ba 251247: 32d0ab992be2880f2d872b0c3d8184323fd3598b v: v3 --- [refs] | 2 +- trunk/drivers/block/xen-blkback/common.h | 32 ++++++++++++++++++++++++ trunk/include/xen/blkif.h | 30 ---------------------- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/[refs] b/[refs] index a6ee18b3477d..86cb3fd56203 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72468bfcb815bc9875a870973469f68e20c78717 +refs/heads/master: 68c88dd7d3caf1737112238fbe91cccd8e7a69fc diff --git a/trunk/drivers/block/xen-blkback/common.h b/trunk/drivers/block/xen-blkback/common.h index da96e3eaa641..647d974da392 100644 --- a/trunk/drivers/block/xen-blkback/common.h +++ b/trunk/drivers/block/xen-blkback/common.h @@ -132,4 +132,36 @@ int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt, struct xenbus_device *xen_blkbk_xenbus(struct backend_info *be); +static void inline blkif_get_x86_32_req(struct blkif_request *dst, + struct blkif_x86_32_request *src) +{ + int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST; + dst->operation = src->operation; + dst->nr_segments = src->nr_segments; + dst->handle = src->handle; + dst->id = src->id; + dst->u.rw.sector_number = src->sector_number; + barrier(); + if (n > dst->nr_segments) + n = dst->nr_segments; + for (i = 0; i < n; i++) + dst->u.rw.seg[i] = src->seg[i]; +} + +static void inline blkif_get_x86_64_req(struct blkif_request *dst, + struct blkif_x86_64_request *src) +{ + int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST; + dst->operation = src->operation; + dst->nr_segments = src->nr_segments; + dst->handle = src->handle; + dst->id = src->id; + dst->u.rw.sector_number = src->sector_number; + barrier(); + if (n > dst->nr_segments) + n = dst->nr_segments; + for (i = 0; i < n; i++) + dst->u.rw.seg[i] = src->seg[i]; +} + #endif /* __BLKIF__BACKEND__COMMON_H__ */ diff --git a/trunk/include/xen/blkif.h b/trunk/include/xen/blkif.h index ab794269fc53..6ed7c01253b2 100644 --- a/trunk/include/xen/blkif.h +++ b/trunk/include/xen/blkif.h @@ -89,34 +89,4 @@ enum blkif_protocol { BLKIF_PROTOCOL_X86_64 = 3, }; -static void inline blkif_get_x86_32_req(struct blkif_request *dst, struct blkif_x86_32_request *src) -{ - int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST; - dst->operation = src->operation; - dst->nr_segments = src->nr_segments; - dst->handle = src->handle; - dst->id = src->id; - dst->u.rw.sector_number = src->sector_number; - barrier(); - if (n > dst->nr_segments) - n = dst->nr_segments; - for (i = 0; i < n; i++) - dst->u.rw.seg[i] = src->seg[i]; -} - -static void inline blkif_get_x86_64_req(struct blkif_request *dst, struct blkif_x86_64_request *src) -{ - int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST; - dst->operation = src->operation; - dst->nr_segments = src->nr_segments; - dst->handle = src->handle; - dst->id = src->id; - dst->u.rw.sector_number = src->sector_number; - barrier(); - if (n > dst->nr_segments) - n = dst->nr_segments; - for (i = 0; i < n; i++) - dst->u.rw.seg[i] = src->seg[i]; -} - #endif /* __XEN_BLKIF_H__ */