Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e4fdaf8 authored by Dmitriy Monakhov's avatar Dmitriy Monakhov Committed by Linus Torvalds
Browse files

[PATCH] jbd layer function called instead of fs specific one 



jbd function called instead of fs specific one.

Signed-off-by: default avatarDmitriy Monakhov <dmonakhov@openvz.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 501b9ebf

fs/ext3/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {

fs/ext4/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {