xen-changelog

[Top] [All Lists]

[Xen-changelog] directly return -ENOMEM instead of jumping to a return -

from [Xen patchbot -unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] directly return -ENOMEM instead of jumping to a return -ENOMEM label
From:	Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Tue, 03 Jan 2006 17:10:07 +0000
Delivery-date:	Tue, 03 Jan 2006 17:15:32 +0000
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

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

Signed-off-by: Vincent Hanquez <vincent@xxxxxxxxxxxxx>

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@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] directly return -ENOMEM instead of jumping to a return -ENOMEM label, Xen patchbot -unstable <=

Previous by Date:	[Xen-changelog] move error handling out of line to avoid duplicated code., Xen patchbot -unstable
Next by Date:	[Xen-changelog] Convert old initializer to C99 initializer., Xen patchbot -unstable
Previous by Thread:	[Xen-changelog] move error handling out of line to avoid duplicated code., Xen patchbot -unstable
Next by Thread:	[Xen-changelog] Convert old initializer to C99 initializer., Xen patchbot -unstable
Indexes:	[Date] [Thread] [Top] [All Lists]