提交 0bf16bff 编写于 作者: P Paolo 'Blaisorblade' Giarrusso 提交者: Linus Torvalds

[PATCH] uml ubd driver: do not store error codes as ->fd

To simplify error handling, make sure fd is saved into ubd_dev->fd only when
we are sure it is an fd and not an error code.
Signed-off-by: NPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 84e945e3
...@@ -578,33 +578,36 @@ static int ubd_open_dev(struct ubd *ubd_dev) ...@@ -578,33 +578,36 @@ static int ubd_open_dev(struct ubd *ubd_dev)
struct openflags flags; struct openflags flags;
char **back_ptr; char **back_ptr;
int err, create_cow, *create_ptr; int err, create_cow, *create_ptr;
int fd;
ubd_dev->openflags = ubd_dev->boot_openflags; ubd_dev->openflags = ubd_dev->boot_openflags;
create_cow = 0; create_cow = 0;
create_ptr = (ubd_dev->cow.file != NULL) ? &create_cow : NULL; create_ptr = (ubd_dev->cow.file != NULL) ? &create_cow : NULL;
back_ptr = ubd_dev->no_cow ? NULL : &ubd_dev->cow.file; back_ptr = ubd_dev->no_cow ? NULL : &ubd_dev->cow.file;
ubd_dev->fd = open_ubd_file(ubd_dev->file, &ubd_dev->openflags, ubd_dev->shared,
fd = open_ubd_file(ubd_dev->file, &ubd_dev->openflags, ubd_dev->shared,
back_ptr, &ubd_dev->cow.bitmap_offset, back_ptr, &ubd_dev->cow.bitmap_offset,
&ubd_dev->cow.bitmap_len, &ubd_dev->cow.data_offset, &ubd_dev->cow.bitmap_len, &ubd_dev->cow.data_offset,
create_ptr); create_ptr);
if((ubd_dev->fd == -ENOENT) && create_cow){ if((fd == -ENOENT) && create_cow){
ubd_dev->fd = create_cow_file(ubd_dev->file, ubd_dev->cow.file, fd = create_cow_file(ubd_dev->file, ubd_dev->cow.file,
ubd_dev->openflags, 1 << 9, PAGE_SIZE, ubd_dev->openflags, 1 << 9, PAGE_SIZE,
&ubd_dev->cow.bitmap_offset, &ubd_dev->cow.bitmap_offset,
&ubd_dev->cow.bitmap_len, &ubd_dev->cow.bitmap_len,
&ubd_dev->cow.data_offset); &ubd_dev->cow.data_offset);
if(ubd_dev->fd >= 0){ if(fd >= 0){
printk(KERN_INFO "Creating \"%s\" as COW file for " printk(KERN_INFO "Creating \"%s\" as COW file for "
"\"%s\"\n", ubd_dev->file, ubd_dev->cow.file); "\"%s\"\n", ubd_dev->file, ubd_dev->cow.file);
} }
} }
if(ubd_dev->fd < 0){ if(fd < 0){
printk("Failed to open '%s', errno = %d\n", ubd_dev->file, printk("Failed to open '%s', errno = %d\n", ubd_dev->file,
-ubd_dev->fd); -fd);
return(ubd_dev->fd); return fd;
} }
ubd_dev->fd = fd;
if(ubd_dev->cow.file != NULL){ if(ubd_dev->cow.file != NULL){
err = -ENOMEM; err = -ENOMEM;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册