]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'writeback-plugging'
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Sep 2015 18:19:01 +0000 (11:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Sep 2015 18:19:01 +0000 (11:19 -0700)
Fix up the writeback plugging introduced in commit d353d7587d02
("writeback: plug writeback at a high level") that then caused problems
due to the unplug happening with a spinlock held.

* writeback-plugging:
  writeback: plug writeback in wb_writeback() and writeback_inodes_wb()
  Revert "writeback: plug writeback at a high level"


Trivial merge