summaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/cow_user.c
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso2006-02-24 22:03:58 +0100
committerLinus Torvalds2006-02-24 23:31:37 +0100
commitfe1db50c7222c67466e41241bc7ef17b469bcf1d (patch)
tree1956b61473d8e9cc8a1a0849e75a728b1395f902 /arch/um/drivers/cow_user.c
parent[PATCH] uml: better error reporting for read_output (diff)
downloadkernel-qcow2-linux-fe1db50c7222c67466e41241bc7ef17b469bcf1d.tar.gz
kernel-qcow2-linux-fe1db50c7222c67466e41241bc7ef17b469bcf1d.tar.xz
kernel-qcow2-linux-fe1db50c7222c67466e41241bc7ef17b469bcf1d.zip
[PATCH] uml: tidying COW code
Improve (especially for coherence) some prototypes, and return code of init_cow_file in error case - for a short write return -EINVAL, otherwise return the error we got! Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Acked-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/drivers/cow_user.c')
-rw-r--r--arch/um/drivers/cow_user.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/drivers/cow_user.c b/arch/um/drivers/cow_user.c
index d1c86bc377bd..61951b721268 100644
--- a/arch/um/drivers/cow_user.c
+++ b/arch/um/drivers/cow_user.c
@@ -362,7 +362,8 @@ int init_cow_file(int fd, char *cow_file, char *backing_file, int sectorsize,
if(err != sizeof(zero)){
cow_printf("Write of bitmap to new COW file '%s' failed, "
"err = %d\n", cow_file, -err);
- err = -EINVAL;
+ if (err >= 0)
+ err = -EINVAL;
goto out;
}