Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Nov 2011 20:11:37 +0000 (12:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Nov 2011 20:11:37 +0000 (12:11 -0800)
* 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix up a undefined error in ext4_free_blocks in debugging code
  ext4: add blk_finish_plug in error case of writepages.
  ext4: Remove kernel_lock annotations
  ext4: ignore journalled data options on remount if fs has no journal

1  2 
fs/ext4/inode.c

diff --combined fs/ext4/inode.c
@@@ -2270,6 -2270,7 +2270,7 @@@ retry
                        ext4_msg(inode->i_sb, KERN_CRIT, "%s: jbd2_start: "
                               "%ld pages, ino %lu; err %d", __func__,
                                wbc->nr_to_write, inode->i_ino, ret);
+                       blk_finish_plug(&plug);
                        goto out_writepages;
                }
  
@@@ -2372,7 -2373,7 +2373,7 @@@ static int ext4_nonda_switch(struct sup
         * start pushing delalloc when 1/2 of free blocks are dirty.
         */
        if (free_blocks < 2 * dirty_blocks)
 -              writeback_inodes_sb_if_idle(sb);
 +              writeback_inodes_sb_if_idle(sb, WB_REASON_FS_FREE_SPACE);
  
        return 0;
  }