aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-05-12 16:23:06 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-05-12 17:55:48 -0400
commitb0f801273f7359a7d91fc94f5c6bf216bc17aaa1 (patch)
tree632c035b77b92b0ab502b52bfc31bc2246220d37
parent03e0edf946a08f498788bb6e8ab58453d98f25b9 (diff)
xen/blkback: Fixing some more of the cleanpatch.pl warnings.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--drivers/block/xen-blkback/blkback.c2
-rw-r--r--drivers/block/xen-blkback/common.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index 362fbf6f656d..d06eb6a50d57 100644
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -637,7 +637,7 @@ static int dispatch_rw_block_io(struct blkif_st *blkif,
637 /* This will be hit if the operation was a flush. */ 637 /* This will be hit if the operation was a flush. */
638 if (!bio) { 638 if (!bio) {
639 BUG_ON(operation != WRITE_FLUSH); 639 BUG_ON(operation != WRITE_FLUSH);
640 640
641 bio = bio_alloc(GFP_KERNEL, 0); 641 bio = bio_alloc(GFP_KERNEL, 0);
642 if (unlikely(bio == NULL)) 642 if (unlikely(bio == NULL))
643 goto fail_put_bio; 643 goto fail_put_bio;
diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h
index 647d974da392..629546558a47 100644
--- a/drivers/block/xen-blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
@@ -132,7 +132,7 @@ int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt,
132 132
133struct xenbus_device *xen_blkbk_xenbus(struct backend_info *be); 133struct xenbus_device *xen_blkbk_xenbus(struct backend_info *be);
134 134
135static void inline blkif_get_x86_32_req(struct blkif_request *dst, 135static inline void blkif_get_x86_32_req(struct blkif_request *dst,
136 struct blkif_x86_32_request *src) 136 struct blkif_x86_32_request *src)
137{ 137{
138 int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST; 138 int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;
@@ -148,7 +148,7 @@ static void inline blkif_get_x86_32_req(struct blkif_request *dst,
148 dst->u.rw.seg[i] = src->seg[i]; 148 dst->u.rw.seg[i] = src->seg[i];
149} 149}
150 150
151static void inline blkif_get_x86_64_req(struct blkif_request *dst, 151static inline void blkif_get_x86_64_req(struct blkif_request *dst,
152 struct blkif_x86_64_request *src) 152 struct blkif_x86_64_request *src)
153{ 153{
154 int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST; 154 int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;