diff --git a/[refs] b/[refs] index df017e18e9bc..0819783e18d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea51d132dbf9b00063169c1159bee253d9649224 +refs/heads/master: 13a79a4741d37fda2fbafb953f0f301dc007928f diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index b5edc6e4bab9..cf20e1fe7782 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/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;