diff --git a/[refs] b/[refs] index f38125998547..8e1def510409 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 501b9ebf43f9973c3e246c8fbd17144d81a989ef +refs/heads/master: 3e4fdaf8aebe489e8e59826fdf78cb64356d2ad0 diff --git a/trunk/fs/ext3/inode.c b/trunk/fs/ext3/inode.c index beaf25f5112f..8a824f4ce5c6 100644 --- a/trunk/fs/ext3/inode.c +++ b/trunk/fs/ext3/inode.c @@ -947,7 +947,7 @@ int ext3_get_blocks_handle(handle_t *handle, struct inode *inode, 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) { diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index a127cc03c9fa..fbff4b9e122a 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -946,7 +946,7 @@ int ext4_get_blocks_handle(handle_t *handle, struct inode *inode, static int ext4_get_block(struct inode *inode, sector_t iblock, struct buffer_head *bh_result, int create) { - handle_t *handle = journal_current_handle(); + handle_t *handle = ext4_journal_current_handle(); int ret = 0; unsigned max_blocks = bh_result->b_size >> inode->i_blkbits; @@ -1716,7 +1716,7 @@ static ssize_t ext4_direct_IO(int rw, struct kiocb *iocb, /* * Reacquire the handle: ext4_get_block() can restart the transaction */ - handle = journal_current_handle(); + handle = ext4_journal_current_handle(); out_stop: if (handle) {