From 3e131b6def48e830e9137f7cf5609a81da5526d3 Mon Sep 17 00:00:00 2001 From: Paolo 'Blaisorblade' Giarrusso Date: Mon, 10 Apr 2006 22:53:41 -0700 Subject: [PATCH] --- yaml --- r: 25479 b: refs/heads/master c: 52c7378236103ce5fbfb7b3e6ac46aa9de9f970d h: refs/heads/master i: 25477: 736f1525685ed7a0a1bf13d417a367aa7ddbd236 25475: f1c445fd1fbd6a0decda3021b584e2db4b7383ee 25471: 7f3839ed8b2106ec947426a34adde3f4eddabacd v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/cow.h | 2 +- trunk/arch/um/drivers/cow_sys.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f6c8873a55ad..c526a74257c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40dbb8676ed0d4c7a40596c7ef8c1c7acde9d972 +refs/heads/master: 52c7378236103ce5fbfb7b3e6ac46aa9de9f970d diff --git a/trunk/arch/um/drivers/cow.h b/trunk/arch/um/drivers/cow.h index 04e3958266e0..dc36b222100b 100644 --- a/trunk/arch/um/drivers/cow.h +++ b/trunk/arch/um/drivers/cow.h @@ -46,7 +46,7 @@ extern int file_reader(__u64 offset, char *buf, int len, void *arg); extern 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, int *sectorsize_out, + unsigned long long *size_out, int *sectorsize_out, __u32 *align_out, int *bitmap_offset_out); extern int write_cow_header(char *cow_file, int fd, char *backing_file, diff --git a/trunk/arch/um/drivers/cow_sys.h b/trunk/arch/um/drivers/cow_sys.h index 94de4ead4f7a..7a5b4afde692 100644 --- a/trunk/arch/um/drivers/cow_sys.h +++ b/trunk/arch/um/drivers/cow_sys.h @@ -28,7 +28,7 @@ static inline int cow_seek_file(int fd, __u64 offset) return(os_seek_file(fd, offset)); } -static inline int cow_file_size(char *file, __u64 *size_out) +static inline int cow_file_size(char *file, unsigned long long *size_out) { return(os_file_size(file, size_out)); }