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

[linux-drm-fsl-dcu.git] / fs / ext3 / inode.c

diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index beaf25f5112fd9f427a393bac3b9f12b634e14de..8a824f4ce5c608d231a6862b5a1c86de167d0882 100644 (file)
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -947,7 +947,7 @@ out:
 static int ext3_get_block(struct inode *inode, sector_t iblock,
                        struct buffer_head *bh_result, int create)
 {
-       handle_t *handle = journal_current_handle();
+       handle_t *handle = ext3_journal_current_handle();
        int ret = 0;
        unsigned max_blocks = bh_result->b_size >> inode->i_blkbits;
 
@@ -1717,7 +1717,7 @@ static ssize_t ext3_direct_IO(int rw, struct kiocb *iocb,
        /*
         * Reacquire the handle: ext3_get_block() can restart the transaction
         */
-       handle = journal_current_handle();
+       handle = ext3_journal_current_handle();
 
 out_stop:
        if (handle) {