diff options
-rw-r--r-- | fs/afs/write.c | 1 | ||||
-rw-r--r-- | fs/btrfs/ordered-data.c | 1 | ||||
-rw-r--r-- | fs/jbd2/commit.c | 1 | ||||
-rw-r--r-- | fs/nfs/write.c | 1 | ||||
-rw-r--r-- | include/linux/writeback.h | 1 | ||||
-rw-r--r-- | include/trace/events/ext4.h | 6 | ||||
-rw-r--r-- | mm/page-writeback.c | 2 |
7 files changed, 2 insertions, 11 deletions
diff --git a/fs/afs/write.c b/fs/afs/write.c index c2e7a7ff0080..c63a3c8beb73 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c | |||
@@ -712,7 +712,6 @@ int afs_writeback_all(struct afs_vnode *vnode) | |||
712 | .bdi = mapping->backing_dev_info, | 712 | .bdi = mapping->backing_dev_info, |
713 | .sync_mode = WB_SYNC_ALL, | 713 | .sync_mode = WB_SYNC_ALL, |
714 | .nr_to_write = LONG_MAX, | 714 | .nr_to_write = LONG_MAX, |
715 | .for_writepages = 1, | ||
716 | .range_cyclic = 1, | 715 | .range_cyclic = 1, |
717 | }; | 716 | }; |
718 | int ret; | 717 | int ret; |
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index d6f0806c682f..7b2f401e604e 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c | |||
@@ -740,7 +740,6 @@ int btrfs_fdatawrite_range(struct address_space *mapping, loff_t start, | |||
740 | .nr_to_write = mapping->nrpages * 2, | 740 | .nr_to_write = mapping->nrpages * 2, |
741 | .range_start = start, | 741 | .range_start = start, |
742 | .range_end = end, | 742 | .range_end = end, |
743 | .for_writepages = 1, | ||
744 | }; | 743 | }; |
745 | return btrfs_writepages(mapping, &wbc); | 744 | return btrfs_writepages(mapping, &wbc); |
746 | } | 745 | } |
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 7b4088b2364d..0df600e9162d 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
@@ -220,7 +220,6 @@ static int journal_submit_inode_data_buffers(struct address_space *mapping) | |||
220 | .nr_to_write = mapping->nrpages * 2, | 220 | .nr_to_write = mapping->nrpages * 2, |
221 | .range_start = 0, | 221 | .range_start = 0, |
222 | .range_end = i_size_read(mapping->host), | 222 | .range_end = i_size_read(mapping->host), |
223 | .for_writepages = 1, | ||
224 | }; | 223 | }; |
225 | 224 | ||
226 | ret = generic_writepages(mapping, &wbc); | 225 | ret = generic_writepages(mapping, &wbc); |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 120acadc6a84..53eb26c16b50 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -1490,7 +1490,6 @@ static int nfs_write_mapping(struct address_space *mapping, int how) | |||
1490 | .nr_to_write = LONG_MAX, | 1490 | .nr_to_write = LONG_MAX, |
1491 | .range_start = 0, | 1491 | .range_start = 0, |
1492 | .range_end = LLONG_MAX, | 1492 | .range_end = LLONG_MAX, |
1493 | .for_writepages = 1, | ||
1494 | }; | 1493 | }; |
1495 | 1494 | ||
1496 | return __nfs_write_mapping(mapping, &wbc, how); | 1495 | return __nfs_write_mapping(mapping, &wbc, how); |
diff --git a/include/linux/writeback.h b/include/linux/writeback.h index d347632f1861..48a054e2b716 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h | |||
@@ -50,7 +50,6 @@ struct writeback_control { | |||
50 | unsigned encountered_congestion:1; /* An output: a queue is full */ | 50 | unsigned encountered_congestion:1; /* An output: a queue is full */ |
51 | unsigned for_kupdate:1; /* A kupdate writeback */ | 51 | unsigned for_kupdate:1; /* A kupdate writeback */ |
52 | unsigned for_reclaim:1; /* Invoked from the page allocator */ | 52 | unsigned for_reclaim:1; /* Invoked from the page allocator */ |
53 | unsigned for_writepages:1; /* This is a writepages() call */ | ||
54 | unsigned range_cyclic:1; /* range_start is cyclic */ | 53 | unsigned range_cyclic:1; /* range_start is cyclic */ |
55 | unsigned more_io:1; /* more io to be dispatched */ | 54 | unsigned more_io:1; /* more io to be dispatched */ |
56 | /* | 55 | /* |
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h index 7d8b5bc74185..8d433c4e3709 100644 --- a/include/trace/events/ext4.h +++ b/include/trace/events/ext4.h | |||
@@ -227,7 +227,6 @@ TRACE_EVENT(ext4_da_writepages, | |||
227 | __field( char, nonblocking ) | 227 | __field( char, nonblocking ) |
228 | __field( char, for_kupdate ) | 228 | __field( char, for_kupdate ) |
229 | __field( char, for_reclaim ) | 229 | __field( char, for_reclaim ) |
230 | __field( char, for_writepages ) | ||
231 | __field( char, range_cyclic ) | 230 | __field( char, range_cyclic ) |
232 | ), | 231 | ), |
233 | 232 | ||
@@ -241,16 +240,15 @@ TRACE_EVENT(ext4_da_writepages, | |||
241 | __entry->nonblocking = wbc->nonblocking; | 240 | __entry->nonblocking = wbc->nonblocking; |
242 | __entry->for_kupdate = wbc->for_kupdate; | 241 | __entry->for_kupdate = wbc->for_kupdate; |
243 | __entry->for_reclaim = wbc->for_reclaim; | 242 | __entry->for_reclaim = wbc->for_reclaim; |
244 | __entry->for_writepages = wbc->for_writepages; | ||
245 | __entry->range_cyclic = wbc->range_cyclic; | 243 | __entry->range_cyclic = wbc->range_cyclic; |
246 | ), | 244 | ), |
247 | 245 | ||
248 | TP_printk("dev %s ino %lu nr_t_write %ld pages_skipped %ld range_start %llu range_end %llu nonblocking %d for_kupdate %d for_reclaim %d for_writepages %d range_cyclic %d", | 246 | TP_printk("dev %s ino %lu nr_t_write %ld pages_skipped %ld range_start %llu range_end %llu nonblocking %d for_kupdate %d for_reclaim %d range_cyclic %d", |
249 | jbd2_dev_to_name(__entry->dev), __entry->ino, __entry->nr_to_write, | 247 | jbd2_dev_to_name(__entry->dev), __entry->ino, __entry->nr_to_write, |
250 | __entry->pages_skipped, __entry->range_start, | 248 | __entry->pages_skipped, __entry->range_start, |
251 | __entry->range_end, __entry->nonblocking, | 249 | __entry->range_end, __entry->nonblocking, |
252 | __entry->for_kupdate, __entry->for_reclaim, | 250 | __entry->for_kupdate, __entry->for_reclaim, |
253 | __entry->for_writepages, __entry->range_cyclic) | 251 | __entry->range_cyclic) |
254 | ); | 252 | ); |
255 | 253 | ||
256 | TRACE_EVENT(ext4_da_writepages_result, | 254 | TRACE_EVENT(ext4_da_writepages_result, |
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index dd73d29c15a8..abc648f5de00 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
@@ -1020,12 +1020,10 @@ int do_writepages(struct address_space *mapping, struct writeback_control *wbc) | |||
1020 | 1020 | ||
1021 | if (wbc->nr_to_write <= 0) | 1021 | if (wbc->nr_to_write <= 0) |
1022 | return 0; | 1022 | return 0; |
1023 | wbc->for_writepages = 1; | ||
1024 | if (mapping->a_ops->writepages) | 1023 | if (mapping->a_ops->writepages) |
1025 | ret = mapping->a_ops->writepages(mapping, wbc); | 1024 | ret = mapping->a_ops->writepages(mapping, wbc); |
1026 | else | 1025 | else |
1027 | ret = generic_writepages(mapping, wbc); | 1026 | ret = generic_writepages(mapping, wbc); |
1028 | wbc->for_writepages = 0; | ||
1029 | return ret; | 1027 | return ret; |
1030 | } | 1028 | } |
1031 | 1029 | ||