Skip to content

Commit

Permalink
xen/blkback: Fix interface.c checkpatch warnings .. except
Browse files Browse the repository at this point in the history
+               sring_x86_64 = (struct blkif_x86_64_sring *)blkif->blk_ring_area->addr;

WARNING: line over 80 characters
+               BACK_RING_INIT(&blkif->blk_rings.x86_64, sring_x86_64, PAGE_SIZE);

as breaking them up really does not help that much.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  • Loading branch information
Konrad Rzeszutek Wilk committed Apr 14, 2011
1 parent 3c64b58 commit e5f4b3c
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/xen/blkback/interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,17 @@ 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;

/* Already connected through? */
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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit e5f4b3c

Please sign in to comment.