redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] uml: error path cleanup 

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>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
hifive-unleashed-5.1
Jeff Dike 2005-09-03 15:57:29 -07:00 committed by Linus Torvalds
parent 7efd08c855
commit ec7cf783dd
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/um/drivers/ubd_kern.c
View File

@ -668,21 +668,22 @@ static int ubd_add(int n)
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 @@ static int ubd_add(int n)
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)