git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: Add barriers to io{read,write}{8,16,32} accessors as well
[pandora-kernel.git]
/
mm
/
page-writeback.c
diff --git
a/mm/page-writeback.c
b/mm/page-writeback.c
index
bbd396a
..
37498ef
100644
(file)
--- a/
mm/page-writeback.c
+++ b/
mm/page-writeback.c
@@
-495,7
+495,6
@@
static void balance_dirty_pages(struct address_space *mapping,
for (;;) {
struct writeback_control wbc = {
for (;;) {
struct writeback_control wbc = {
- .bdi = bdi,
.sync_mode = WB_SYNC_NONE,
.older_than_this = NULL,
.nr_to_write = write_chunk,
.sync_mode = WB_SYNC_NONE,
.older_than_this = NULL,
.nr_to_write = write_chunk,
@@
-537,7
+536,7
@@
static void balance_dirty_pages(struct address_space *mapping,
* up.
*/
if (bdi_nr_reclaimable > bdi_thresh) {
* up.
*/
if (bdi_nr_reclaimable > bdi_thresh) {
- writeback_inodes_wb
c(
&wbc);
+ writeback_inodes_wb
(&bdi->wb,
&wbc);
pages_written += write_chunk - wbc.nr_to_write;
get_dirty_limits(&background_thresh, &dirty_thresh,
&bdi_thresh, bdi);
pages_written += write_chunk - wbc.nr_to_write;
get_dirty_limits(&background_thresh, &dirty_thresh,
&bdi_thresh, bdi);
@@
-597,7
+596,7
@@
static void balance_dirty_pages(struct address_space *mapping,
(!laptop_mode && ((global_page_state(NR_FILE_DIRTY)
+ global_page_state(NR_UNSTABLE_NFS))
> background_thresh)))
(!laptop_mode && ((global_page_state(NR_FILE_DIRTY)
+ global_page_state(NR_UNSTABLE_NFS))
> background_thresh)))
- bdi_start_
writeback(bdi, NULL, 0
);
+ bdi_start_
background_writeback(bdi
);
}
void set_page_dirty_balance(struct page *page, int page_mkwrite)
}
void set_page_dirty_balance(struct page *page, int page_mkwrite)
@@
-705,9
+704,8
@@
void laptop_mode_timer_fn(unsigned long data)
* We want to write everything out, not just down to the dirty
* threshold
*/
* We want to write everything out, not just down to the dirty
* threshold
*/
-
if (bdi_has_dirty_io(&q->backing_dev_info))
if (bdi_has_dirty_io(&q->backing_dev_info))
- bdi_start_writeback(&q->backing_dev_info,
NULL,
nr_pages);
+ bdi_start_writeback(&q->backing_dev_info, nr_pages);
}
/*
}
/*