Commit d14d0aa7 authored by Andrew Morton's avatar Andrew Morton Committed by James Toy

No longer in linux-next.

Cc: Edward Shishkin <edward.shishkin@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 4ef4b4d5
...@@ -151,8 +151,7 @@ static void balance_dirty_pages_at(reiser4_context *context) ...@@ -151,8 +151,7 @@ static void balance_dirty_pages_at(reiser4_context *context)
*/ */
if (sbinfo != NULL && sbinfo->fake != NULL && if (sbinfo != NULL && sbinfo->fake != NULL &&
context->nr_marked_dirty != 0 && context->nr_marked_dirty != 0 &&
!(current->flags & PF_MEMALLOC) && !(current->flags & PF_MEMALLOC))
!current_is_pdflush())
balance_dirty_pages_ratelimited(sbinfo->fake->i_mapping); balance_dirty_pages_ratelimited(sbinfo->fake->i_mapping);
} }
......
...@@ -1410,7 +1410,7 @@ flush_some_atom(jnode * start, long *nr_submitted, const struct writeback_contro ...@@ -1410,7 +1410,7 @@ flush_some_atom(jnode * start, long *nr_submitted, const struct writeback_contro
* Write throttling is case of no one atom can be * Write throttling is case of no one atom can be
* flushed/committed. * flushed/committed.
*/ */
if (!current_is_pdflush() && !wbc->nonblocking) { if (!wbc->nonblocking) {
list_for_each_entry(atom, &tmgr->atoms_list, atom_link) { list_for_each_entry(atom, &tmgr->atoms_list, atom_link) {
spin_lock_atom(atom); spin_lock_atom(atom);
/* Repeat the check from the above. */ /* Repeat the check from the above. */
......
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