diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-20 23:06:15 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-20 23:06:15 +0100 |
| commit | d1a7fddf420b1f5a7d9a899b3388026084a67d33 (patch) | |
| tree | 7044a8b9a1b6fadc7b027d4a82840c084b0c8012 /mm | |
| parent | 778c4c821779bb7eef7f5a1eea4d15d05d976f8b (diff) | |
| parent | c0e1936338a11ea252d11370ff62e40db334f646 (diff) | |
| download | linux-d1a7fddf420b1f5a7d9a899b3388026084a67d33.tar.bz2 | |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/page-writeback.c | 12 | ||||
| -rw-r--r-- | mm/shmem.c | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index c130a137c129..b40f6d5f8fe9 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -876,6 +876,7 @@ int write_cache_pages(struct address_space *mapping, pgoff_t end; /* Inclusive */ int scanned = 0; int range_whole = 0; + long nr_to_write = wbc->nr_to_write; if (wbc->nonblocking && bdi_write_congested(bdi)) { wbc->encountered_congestion = 1; @@ -939,7 +940,7 @@ retry: unlock_page(page); ret = 0; } - if (ret || (--(wbc->nr_to_write) <= 0)) + if (ret || (--nr_to_write <= 0)) done = 1; if (wbc->nonblocking && bdi_write_congested(bdi)) { wbc->encountered_congestion = 1; @@ -958,11 +959,12 @@ retry: index = 0; goto retry; } - if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0)) - mapping->writeback_index = index; + if (!wbc->no_nrwrite_index_update) { + if (wbc->range_cyclic || (range_whole && nr_to_write > 0)) + mapping->writeback_index = index; + wbc->nr_to_write = nr_to_write; + } - if (wbc->range_cont) - wbc->range_start = index << PAGE_CACHE_SHIFT; return ret; } EXPORT_SYMBOL(write_cache_pages); diff --git a/mm/shmem.c b/mm/shmem.c index bf66d0191baf..d87958a5f03e 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2580,6 +2580,7 @@ put_memory: shmem_unacct_size(flags, size); return ERR_PTR(error); } +EXPORT_SYMBOL_GPL(shmem_file_setup); /** * shmem_zero_setup - setup a shared anonymous mapping |