* [PATCH 1/9] UML - Error path cleanup
@ 2005-08-29 20:06 Jeff Dike
0 siblings, 0 replies; only message in thread
From: Jeff Dike @ 2005-08-29 20:06 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, user-mode-linux-devel
This cleans up the error path in ubd_open, causing it now to call
ubd_close appropriately when something fails.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Index: linux-2.6.13-rc6-mm1/arch/um/drivers/ubd_kern.c
===================================================================
--- linux-2.6.13-rc6-mm1.orig/arch/um/drivers/ubd_kern.c 2005-08-29 11:51:22.000000000 -0400
+++ linux-2.6.13-rc6-mm1/arch/um/drivers/ubd_kern.c 2005-08-29 11:57:44.000000000 -0400
@@ -668,21 +668,22 @@
struct ubd *dev = &ubd_dev[n];
int err;
+ err = -ENODEV;
if(dev->file == NULL)
- return(-ENODEV);
+ goto out;
if (ubd_open_dev(dev))
- return(-ENODEV);
+ goto out;
err = ubd_file_size(dev, &dev->size);
if(err < 0)
- return(err);
+ goto out_close;
dev->size = ROUND_BLOCK(dev->size);
err = ubd_new_disk(MAJOR_NR, dev->size, n, &ubd_gendisk[n]);
if(err)
- return(err);
+ goto out_close;
if(fake_major != MAJOR_NR)
ubd_new_disk(fake_major, dev->size, n,
@@ -693,8 +694,11 @@
if (fake_ide)
make_ide_entries(ubd_gendisk[n]->disk_name);
+ err = 0;
+out_close:
ubd_close(dev);
- return 0;
+out:
+ return err;
}
static int ubd_config(char *str)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-08-29 20:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-08-29 20:06 [PATCH 1/9] UML - Error path cleanup Jeff Dike
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).