Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 25479
b: refs/heads/master
c: 52c7378
h: refs/heads/master
i:
  25477: 736f152
  25475: f1c445f
  25471: 7f3839e
v: v3
  • Loading branch information
Paolo 'Blaisorblade' Giarrusso authored and Linus Torvalds committed Apr 11, 2006
1 parent 97dbb2c commit 3e131b6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 40dbb8676ed0d4c7a40596c7ef8c1c7acde9d972
refs/heads/master: 52c7378236103ce5fbfb7b3e6ac46aa9de9f970d
2 changes: 1 addition & 1 deletion trunk/arch/um/drivers/cow.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/um/drivers/cow_sys.h
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down

0 comments on commit 3e131b6

Please sign in to comment.