summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorYongqiang Yang <xiaoqiangnk@gmail.com>2011-12-13 21:51:55 -0500
committerTheodore Ts'o <tytso@mit.edu>2011-12-13 21:51:55 -0500
commit13a79a4741d37fda2fbafb953f0f301dc007928f (patch)
treeb88b5b99690738c278c48b180cbd1ab2821522f6 /fs
parentea51d132dbf9b00063169c1159bee253d9649224 (diff)
downloadlinux-3.10-13a79a4741d37fda2fbafb953f0f301dc007928f.tar.gz
linux-3.10-13a79a4741d37fda2fbafb953f0f301dc007928f.tar.bz2
linux-3.10-13a79a4741d37fda2fbafb953f0f301dc007928f.zip
ext4: avoid potential hang in mpage_submit_io() when blocksize < pagesize
If there is an unwritten but clean buffer in a page and there is a dirty buffer after the buffer, then mpage_submit_io does not write the dirty buffer out. As a result, da_writepages loops forever. This patch fixes the problem by checking dirty flag. Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: stable@kernel.org
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/inode.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index b5edc6e4bab..cf20e1fe778 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1339,8 +1339,11 @@ static int mpage_da_submit_io(struct mpage_da_data *mpd,
clear_buffer_unwritten(bh);
}
- /* skip page if block allocation undone */
- if (buffer_delay(bh) || buffer_unwritten(bh))
+ /*
+ * skip page if block allocation undone and
+ * block is dirty
+ */
+ if (ext4_bh_delay_or_unwritten(NULL, bh))
skip_page = 1;
bh = bh->b_this_page;
block_start += bh->b_size;