aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvhanquez@kneesa.uk.xensource.com <vhanquez@kneesa.uk.xensource.com>2005-12-31 14:17:10 +0000
committervhanquez@kneesa.uk.xensource.com <vhanquez@kneesa.uk.xensource.com>2005-12-31 14:17:10 +0000
commit80a654a545cb5cc3a39ba5c761fb31330702a453 (patch)
treee1d8c05cb9a0d17153418c9591e4e4ed0d038bf6
parent4b6164a042993aa91a346146344cc9a6f1a775e3 (diff)
downloadxen-80a654a545cb5cc3a39ba5c761fb31330702a453.tar.gz
xen-80a654a545cb5cc3a39ba5c761fb31330702a453.tar.bz2
xen-80a654a545cb5cc3a39ba5c761fb31330702a453.zip
directly return -ENOMEM instead of jumping to a return -ENOMEM label
Signed-off-by: Vincent Hanquez <vincent@xensource.com>
-rw-r--r--linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c
index 299a4a5a59..4a16e1e10a 100644
--- a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c
@@ -225,7 +225,7 @@ static int blktap_open(struct inode *inode, struct file *filp)
/* 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 @@ static int blktap_open(struct inode *inode, struct file *filp)
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)