Commit b443e733 authored by Eric Sandeen's avatar Eric Sandeen Committed by Theodore Ts'o

ext4: don't bump up LONG_MAX nr_to_write by a factor of 8

I'm uneasy with lots of stuff going on in ext4_da_writepages(),
but bumping nr_to_write from LLONG_MAX to -8 clearly isn't
making anything better, so avoid the multiplier in that case.
Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 659c6009
...@@ -3004,9 +3004,12 @@ static int ext4_da_writepages(struct address_space *mapping, ...@@ -3004,9 +3004,12 @@ static int ext4_da_writepages(struct address_space *mapping,
* sbi->max_writeback_mb_bump whichever is smaller. * sbi->max_writeback_mb_bump whichever is smaller.
*/ */
max_pages = sbi->s_max_writeback_mb_bump << (20 - PAGE_CACHE_SHIFT); max_pages = sbi->s_max_writeback_mb_bump << (20 - PAGE_CACHE_SHIFT);
if (!range_cyclic && range_whole) if (!range_cyclic && range_whole) {
desired_nr_to_write = wbc->nr_to_write * 8; if (wbc->nr_to_write == LONG_MAX)
desired_nr_to_write = wbc->nr_to_write;
else else
desired_nr_to_write = wbc->nr_to_write * 8;
} else
desired_nr_to_write = ext4_num_dirty_pages(inode, index, desired_nr_to_write = ext4_num_dirty_pages(inode, index,
max_pages); max_pages);
if (desired_nr_to_write > max_pages) if (desired_nr_to_write > max_pages)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment