From 13501655c5868efdfa65ee839b6e476e4de80013 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Thu, 14 Apr 2011 17:27:29 -0400 Subject: [PATCH] --- yaml --- r: 251226 b: refs/heads/master c: e5f4b3c498623fc3d83f6d92e00a2b2dbf500cd0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/xen/blkback/interface.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e6f7749da8db..b0852e6b881a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c64b58cd614c976dcb19e16fa59ab620b3fe130 +refs/heads/master: e5f4b3c498623fc3d83f6d92e00a2b2dbf500cd0 diff --git a/trunk/drivers/xen/blkback/interface.c b/trunk/drivers/xen/blkback/interface.c index 7d59f13115cf..163aed41e825 100644 --- a/trunk/drivers/xen/blkback/interface.c +++ b/trunk/drivers/xen/blkback/interface.c @@ -86,7 +86,8 @@ static void unmap_frontend_page(struct blkif_st *blkif) BUG(); } -int blkif_map(struct blkif_st *blkif, unsigned long shared_page, unsigned int evtchn) +int blkif_map(struct blkif_st *blkif, unsigned long shared_page, + unsigned int evtchn) { int err; @@ -94,7 +95,8 @@ int blkif_map(struct blkif_st *blkif, unsigned long shared_page, unsigned int ev if (blkif->irq) return 0; - if ( (blkif->blk_ring_area = alloc_vm_area(PAGE_SIZE)) == NULL ) + blkif->blk_ring_area = alloc_vm_area(PAGE_SIZE); + if (!blkif->blk_ring_area) return -ENOMEM; err = map_frontend_page(blkif, shared_page); @@ -131,8 +133,7 @@ int blkif_map(struct blkif_st *blkif, unsigned long shared_page, unsigned int ev err = bind_interdomain_evtchn_to_irqhandler( blkif->domid, evtchn, blkif_be_int, 0, "blkif-backend", blkif); - if (err < 0) - { + if (err < 0) { unmap_frontend_page(blkif); free_vm_area(blkif->blk_ring_area); blkif->blk_rings.common.sring = NULL;