vserver 1.9.5.x5

[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..c43425c 100644 (file)
--- a/arch/um/drivers/cow_user.c
+++ b/arch/um/drivers/cow_user.c
@@ -67,7 +67,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 +159,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;
@@ -236,7 +236,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)
 {
@@ -329,7 +329,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;