Mailing List Archive

# HG changeset patch
# User vhanquez@kneesa.uk.xensource.com
# Node ID 248a75201ba355fe15eec48e30b2b267449bfd2f
# Parent 0fd894ba6ba0180b6c67ae953366e9554de24df5
directly return -ENOMEM instead of jumping to a return -ENOMEM label

Signed-off-by: Vincent Hanquez <vincent@xensource.com>

diff -r 0fd894ba6ba0 -r 248a75201ba3 linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c
--- a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c Sat Dec 31 14:16:13 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c Sat Dec 31 14:17:10 2005
@@ -225,7 +225,7 @@
/* Allocate the fe ring. */
sring = (blkif_sring_t *)get_zeroed_page(GFP_KERNEL);
if (sring == NULL)
- goto fail_nomem;
+ return -ENOMEM;

SetPageReserved(virt_to_page(sring));

@@ -233,9 +233,6 @@
FRONT_RING_INIT(&blktap_ufe_ring, sring, PAGE_SIZE);

return 0;
-
- fail_nomem:
- return -ENOMEM;
}

static int blktap_release(struct inode *inode, struct file *filp)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog