GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-04-01 20:03:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mm: clean up buffered write code

Browse source 
Rename some variables and fix some types.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2007-10-16 01:24:55 -07:00 • committed by Linus Torvalds
parent 6814d7a912
commit ae37461c70
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
mm/filemap.c
View file

@ -1844,10 +1844,9 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
long status = 0; long status = 0;
struct page *page; struct page *page;
struct page *cached_page = NULL; struct page *cached_page = NULL;
size_t bytes;
struct pagevec lru_pvec; struct pagevec lru_pvec;
const struct iovec *cur_iov = iov; /* current iovec */ const struct iovec *cur_iov = iov; /* current iovec */
size_t iov_base = 0; /* offset in the current iovec */ size_t iov_offset = 0; /* offset in the current iovec */
char __user *buf; char __user *buf;
pagevec_init(&lru_pvec, 0); pagevec_init(&lru_pvec, 0);
@ -1858,31 +1857,33 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
if (likely(nr_segs == 1)) if (likely(nr_segs == 1))
buf = iov->iov_base + written; buf = iov->iov_base + written;
else { else {
filemap_set_next_iovec(&cur_iov, &iov_base, written); filemap_set_next_iovec(&cur_iov, &iov_offset, written);
buf = cur_iov->iov_base + iov_base; buf = cur_iov->iov_base + iov_offset;
} }
do { do {
unsigned long index; pgoff_t index; /* Pagecache index for current page */
unsigned long offset; unsigned long offset; /* Offset into pagecache page */
unsigned long maxlen; unsigned long maxlen; /* Bytes remaining in current iovec */
size_t copied; size_t bytes; /* Bytes to write to page */
size_t copied; /* Bytes copied from user */
offset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */ offset = (pos & (PAGE_CACHE_SIZE - 1));
index = pos >> PAGE_CACHE_SHIFT; index = pos >> PAGE_CACHE_SHIFT;
bytes = PAGE_CACHE_SIZE - offset; bytes = PAGE_CACHE_SIZE - offset;
if (bytes > count) if (bytes > count)
bytes = count; bytes = count;
maxlen = cur_iov->iov_len - iov_offset;
if (maxlen > bytes)
maxlen = bytes;
/* /*
* Bring in the user page that we will copy from _first_. * Bring in the user page that we will copy from _first_.
* Otherwise there's a nasty deadlock on copying from the * Otherwise there's a nasty deadlock on copying from the
* same page as we're writing to, without it being marked * same page as we're writing to, without it being marked
* up-to-date. * up-to-date.
*/ */
maxlen = cur_iov->iov_len - iov_base;
if (maxlen > bytes)
maxlen = bytes;
fault_in_pages_readable(buf, maxlen); fault_in_pages_readable(buf, maxlen);
page = __grab_cache_page(mapping,index,&cached_page,&lru_pvec); page = __grab_cache_page(mapping,index,&cached_page,&lru_pvec);
@ -1913,7 +1914,7 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
buf, bytes); buf, bytes);
else else
copied = filemap_copy_from_user_iovec(page, offset, copied = filemap_copy_from_user_iovec(page, offset,
cur_iov, iov_base, bytes); cur_iov, iov_offset, bytes);
flush_dcache_page(page); flush_dcache_page(page);
status = a_ops->commit_write(file, page, offset, offset+bytes); status = a_ops->commit_write(file, page, offset, offset+bytes);
if (status == AOP_TRUNCATED_PAGE) { if (status == AOP_TRUNCATED_PAGE) {
@ -1931,12 +1932,12 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
buf += status; buf += status;
if (unlikely(nr_segs > 1)) { if (unlikely(nr_segs > 1)) {
filemap_set_next_iovec(&cur_iov, filemap_set_next_iovec(&cur_iov,
&iov_base, status); &iov_offset, status);
if (count) if (count)
buf = cur_iov->iov_base + buf = cur_iov->iov_base +
iov_base; iov_offset;
} else { } else {
iov_base += status; iov_offset += status;
} }
} }
} }