linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / um / drivers / cow_user.c

diff --git a/arch/um/drivers/cow_user.c b/arch/um/drivers/cow_user.c
index d3fad24..61951b7 100644 (file)
--- a/arch/um/drivers/cow_user.c
+++ b/arch/um/drivers/cow_user.c
@@ -1,12 +1,14 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
+/* _XOPEN_SOURCE is needed for pread, but we define _GNU_SOURCE, which defines
+ * that.
+ */
 #include <unistd.h>
 #include <byteswap.h>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <sys/user.h>
-#include <netinet/in.h>
 
 #include "os.h"
 
@@ -67,7 +69,7 @@ struct cow_header_v2 {
 struct cow_header_v3 {
        __u32 magic;
        __u32 version;
-       time_t mtime;
+       __u32 mtime;
        __u64 size;
        __u32 sectorsize;
        __u32 alignment;
@@ -159,7 +161,7 @@ static int absolutize(char *to, int size, char *from)
 }
 
 int write_cow_header(char *cow_file, int fd, char *backing_file,
-                    int sectorsize, int alignment, long long *size)
+                    int sectorsize, int alignment, unsigned long long *size)
 {
        struct cow_header_v3 *header;
        unsigned long modtime;
@@ -174,7 +176,7 @@ int write_cow_header(char *cow_file, int fd, char *backing_file,
        err = -ENOMEM;
        header = cow_malloc(sizeof(*header));
        if(header == NULL){
-               cow_printf("Failed to allocate COW V3 header\n");
+               cow_printf("write_cow_header - failed to allocate COW V3 header\n");
                goto out;
        }
        header->magic = htonl(COW_MAGIC);
@@ -194,15 +196,17 @@ int write_cow_header(char *cow_file, int fd, char *backing_file,
 
        err = os_file_modtime(header->backing_file, &modtime);
        if(err < 0){
-               cow_printf("Backing file '%s' mtime request failed, "
-                          "err = %d\n", header->backing_file, -err);
+               cow_printf("write_cow_header - backing file '%s' mtime "
+                          "request failed, err = %d\n", header->backing_file,
+                          -err);
                goto out_free;
        }
 
        err = cow_file_size(header->backing_file, size);
        if(err < 0){
-               cow_printf("Couldn't get size of backing file '%s', "
-                          "err = %d\n", header->backing_file, -err);
+               cow_printf("write_cow_header - couldn't get size of "
+                          "backing file '%s', err = %d\n",
+                          header->backing_file, -err);
                goto out_free;
        }
 
@@ -212,10 +216,11 @@ int write_cow_header(char *cow_file, int fd, char *backing_file,
        header->alignment = htonl(alignment);
        header->cow_format = COW_BITMAP;
 
-       err = os_write_file(fd, header, sizeof(*header));
+       err = cow_write_file(fd, header, sizeof(*header));
        if(err != sizeof(*header)){
-               cow_printf("Write of header to new COW file '%s' failed, "
-                          "err = %d\n", cow_file, -err);
+               cow_printf("write_cow_header - write of header to "
+                          "new COW file '%s' failed, err = %d\n", cow_file,
+                          -err);
                goto out_free;
        }
        err = 0;
@@ -236,7 +241,7 @@ int file_reader(__u64 offset, char *buf, int len, void *arg)
 
 int read_cow_header(int (*reader)(__u64, char *, int, void *), void *arg,
                    __u32 *version_out, char **backing_file_out,
-                   time_t *mtime_out, __u64 *size_out,
+                   time_t *mtime_out, unsigned long long *size_out,
                    int *sectorsize_out, __u32 *align_out,
                    int *bitmap_offset_out)
 {
@@ -297,7 +302,7 @@ int read_cow_header(int (*reader)(__u64, char *, int, void *), void *arg,
        }
        else if(version == 3){
                if(n < sizeof(header->v3)){
-                       cow_printf("read_cow_header - failed to read V2 "
+                       cow_printf("read_cow_header - failed to read V3 "
                                   "header\n");
                        goto out;
                }
@@ -329,7 +334,7 @@ int init_cow_file(int fd, char *cow_file, char *backing_file, int sectorsize,
                  int alignment, int *bitmap_offset_out,
                  unsigned long *bitmap_len_out, int *data_offset_out)
 {
-       __u64 size, offset;
+       unsigned long long size, offset;
        char zero = 0;
        int err;
 
@@ -357,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;
        }