Commit dd2ad358 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] 64-bit type correctness in filemap.c

From davem: replace `unsigned' with size_t.
parent fa63ebcc
...@@ -1643,7 +1643,7 @@ filemap_copy_from_user(struct page *page, unsigned long offset, ...@@ -1643,7 +1643,7 @@ filemap_copy_from_user(struct page *page, unsigned long offset,
static inline int static inline int
__filemap_copy_from_user_iovec(char *vaddr, __filemap_copy_from_user_iovec(char *vaddr,
const struct iovec *iov, size_t base, unsigned bytes) const struct iovec *iov, size_t base, size_t bytes)
{ {
int left = 0; int left = 0;
...@@ -1662,7 +1662,7 @@ __filemap_copy_from_user_iovec(char *vaddr, ...@@ -1662,7 +1662,7 @@ __filemap_copy_from_user_iovec(char *vaddr,
static inline int static inline int
filemap_copy_from_user_iovec(struct page *page, unsigned long offset, filemap_copy_from_user_iovec(struct page *page, unsigned long offset,
const struct iovec *iov, size_t base, unsigned bytes) const struct iovec *iov, size_t base, size_t bytes)
{ {
char *kaddr; char *kaddr;
int left; int left;
...@@ -1679,7 +1679,7 @@ filemap_copy_from_user_iovec(struct page *page, unsigned long offset, ...@@ -1679,7 +1679,7 @@ filemap_copy_from_user_iovec(struct page *page, unsigned long offset,
} }
static inline void static inline void
filemap_set_next_iovec(const struct iovec **iovp, size_t *basep, unsigned bytes) filemap_set_next_iovec(const struct iovec **iovp, size_t *basep, size_t bytes)
{ {
const struct iovec *iov = *iovp; const struct iovec *iov = *iovp;
size_t base = *basep; size_t base = *basep;
...@@ -1723,11 +1723,11 @@ generic_file_write_nolock(struct file *file, const struct iovec *iov, ...@@ -1723,11 +1723,11 @@ generic_file_write_nolock(struct file *file, const struct iovec *iov,
struct page *cached_page = NULL; struct page *cached_page = NULL;
ssize_t written; ssize_t written;
int err; int err;
unsigned bytes; size_t bytes;
time_t time_now; time_t time_now;
struct pagevec lru_pvec; struct pagevec lru_pvec;
const struct iovec *cur_iov = iov; /* current iovec */ const struct iovec *cur_iov = iov; /* current iovec */
unsigned iov_base = 0; /* offset in the current iovec */ size_t iov_base = 0; /* offset in the current iovec */
unsigned long seg; unsigned long seg;
char *buf; char *buf;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment