Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux

Pull writeback fixes from Wu Fengguang:
 "Two writeback fixes

   - fix negative (setpoint - dirty) in 32bit archs

   - use down_read_trylock() in writeback_inodes_sb(_nr)_if_idle()"

* tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
  Negative (setpoint-dirty) in bdi_position_ratio()
  vfs: re-implement writeback_inodes_sb(_nr)_if_idle() and rename them

1 files changed, 2 insertions, 6 deletions

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 9c4f4b1c97f8..9ea0cde3fa9e 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2512,12 +2512,8 @@ static int ext4_nonda_switch(struct super_block *sb)
         /*
          * Start pushing delalloc when 1/2 of free blocks are dirty.
          */
-        if (dirty_blocks && (free_blocks < 2 * dirty_blocks) &&
-            !writeback_in_progress(sb->s_bdi) &&
-            down_read_trylock(&sb->s_umount)) {
-                writeback_inodes_sb(sb, WB_REASON_FS_FREE_SPACE);
-                up_read(&sb->s_umount);
-        }
+        if (dirty_blocks && (free_blocks < 2 * dirty_blocks))
+                try_to_writeback_inodes_sb(sb, WB_REASON_FS_FREE_SPACE);
 
         if (2 * free_blocks < 3 * dirty_blocks ||
                 free_blocks < (dirty_blocks + EXT4_FREECLUSTERS_WATERMARK)) {