diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-25 14:38:16 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-25 14:38:16 -0400 |
commit | 9c78965ca18594fe0a34a1a1b13781b10f85e4bc (patch) | |
tree | 60c9e83d3c2b56e3c7f5169b63577a72bf7ddb57 /include/linux/writeback.h | |
parent | 139ef32b0e6b88b00b5e3e74d052d938f178dc9b (diff) | |
parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) |
Merge branch 'master' into for-linus
Diffstat (limited to 'include/linux/writeback.h')
-rw-r--r-- | include/linux/writeback.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/writeback.h b/include/linux/writeback.h index f64134653a8c..d63ef8f9609f 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h | |||
@@ -56,15 +56,6 @@ struct writeback_control { | |||
56 | unsigned for_reclaim:1; /* Invoked from the page allocator */ | 56 | unsigned for_reclaim:1; /* Invoked from the page allocator */ |
57 | unsigned range_cyclic:1; /* range_start is cyclic */ | 57 | unsigned range_cyclic:1; /* range_start is cyclic */ |
58 | unsigned more_io:1; /* more io to be dispatched */ | 58 | unsigned more_io:1; /* more io to be dispatched */ |
59 | /* | ||
60 | * write_cache_pages() won't update wbc->nr_to_write and | ||
61 | * mapping->writeback_index if no_nrwrite_index_update | ||
62 | * is set. write_cache_pages() may write more than we | ||
63 | * requested and we want to make sure nr_to_write and | ||
64 | * writeback_index are updated in a consistent manner | ||
65 | * so we use a single control to update them | ||
66 | */ | ||
67 | unsigned no_nrwrite_index_update:1; | ||
68 | }; | 59 | }; |
69 | 60 | ||
70 | /* | 61 | /* |