Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[deliverable/linux.git] / fs / ext4 / inline.c

diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index dfe3b9bafc0d2b9cb4957c189290f8da68fb4dc4..7cbdd3752ba50fcc076ba9ab55c76be65cff3cce 100644 (file)
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -581,9 +581,10 @@ retry:
        if (ret)
                goto out;
 
-       if (ext4_should_dioread_nolock(inode))
-               ret = __block_write_begin(page, from, to, ext4_get_block_write);
-       else
+       if (ext4_should_dioread_nolock(inode)) {
+               ret = __block_write_begin(page, from, to,
+                                         ext4_get_block_unwritten);
+       } else
                ret = __block_write_begin(page, from, to, ext4_get_block);
 
        if (!ret && ext4_should_journal_data(inode)) {
@@ -1696,7 +1697,6 @@ int ext4_delete_inline_entry(handle_t *handle,
        if (err)
                goto out;
 
-       BUFFER_TRACE(bh, "call ext4_handle_dirty_metadata");
        err = ext4_mark_inode_dirty(handle, dir);
        if (unlikely(err))
                goto out;