diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 20:11:37 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 20:11:37 (GMT) |
commit | f8f5ed7c996ad9426847ce09b828d415cb19bc06 (patch) | |
tree | ef5826a0b818ef6130c67da63a8bb8aa81b19dde /fs/ext4/inode.c | |
parent | c292fe4aae5aa5c089633bc40342d27c8275306a (diff) | |
parent | 6e58ad69efe9f4c91eb15f6bc365293414c397ce (diff) | |
download | linux-f8f5ed7c996ad9426847ce09b828d415cb19bc06.tar.xz |
Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* '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
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r-- | fs/ext4/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 240f6e2..fffec40 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -2270,6 +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; } |