Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[cascardo/linux.git] / fs / ocfs2 / aops.c

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 64b11d9..7f60472 100644 (file)
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -589,6 +589,7 @@ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock,
                        ret = -EIO;
                        goto bail;
                }
+               set_buffer_new(bh_result);
                up_write(&OCFS2_I(inode)->ip_alloc_sem);
        }
 
@@ -864,6 +865,7 @@ static ssize_t ocfs2_direct_IO_write(struct kiocb *iocb,
                is_overwrite = ocfs2_is_overwrite(osb, inode, offset);
                if (is_overwrite < 0) {
                        mlog_errno(is_overwrite);
+                       ret = is_overwrite;
                        ocfs2_inode_unlock(inode, 1);
                        goto clean_orphan;
                }