ext4: use jbd2_inode dirty range scoping
Use the newly introduced jbd2_inode dirty range scoping to prevent us from waiting forever when trying to complete a journal transaction. Signed-off-by: Ross Zwisler <zwisler@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Jan Kara <jack@suse.cz> Cc: stable@vger.kernel.org
This commit is contained in:

committed by
Theodore Ts'o

parent
6ba0e7dc64
commit
73131fbb00
@@ -731,10 +731,16 @@ out_sem:
|
||||
!(flags & EXT4_GET_BLOCKS_ZERO) &&
|
||||
!ext4_is_quota_file(inode) &&
|
||||
ext4_should_order_data(inode)) {
|
||||
loff_t start_byte =
|
||||
(loff_t)map->m_lblk << inode->i_blkbits;
|
||||
loff_t length = (loff_t)map->m_len << inode->i_blkbits;
|
||||
|
||||
if (flags & EXT4_GET_BLOCKS_IO_SUBMIT)
|
||||
ret = ext4_jbd2_inode_add_wait(handle, inode);
|
||||
ret = ext4_jbd2_inode_add_wait(handle, inode,
|
||||
start_byte, length);
|
||||
else
|
||||
ret = ext4_jbd2_inode_add_write(handle, inode);
|
||||
ret = ext4_jbd2_inode_add_write(handle, inode,
|
||||
start_byte, length);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
@@ -4085,7 +4091,8 @@ static int __ext4_block_zero_page_range(handle_t *handle,
|
||||
err = 0;
|
||||
mark_buffer_dirty(bh);
|
||||
if (ext4_should_order_data(inode))
|
||||
err = ext4_jbd2_inode_add_write(handle, inode);
|
||||
err = ext4_jbd2_inode_add_write(handle, inode, from,
|
||||
length);
|
||||
}
|
||||
|
||||
unlock:
|
||||
|
Reference in New Issue
Block a user