diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:57:21 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:57:21 -0600 |
| commit | 54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch) | |
| tree | 40619a66ae6d8703a57bf681d087ffeabbffd346 /fs/ext4/inode.c | |
| parent | 8ce0a7df6e6117d8814e976d4b7ce6a6b2c9cf93 (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
Merge branch 'master' into 85xx
Diffstat (limited to 'fs/ext4/inode.c')
| -rw-r--r-- | fs/ext4/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index a127cc03c9f..fbff4b9e122 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -946,7 +946,7 @@ out: 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) { |