mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
ext4: remove calls to ext4_jbd2_file_inode() from delalloc write path
The calls to ext4_jbd2_file_inode() are needed to guarantee that we do not expose stale data in the data=ordered mode. However, they are not necessary because in all of the cases where we have newly allocated blocks in the delayed allocation write path, we immediately submit the dirty pages for I/O. Hence, we can avoid the overhead of adding the inode to the list of inodes whose data pages will be to be flushed out to disk completely during the next commit operation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
parent
66bea92c69
commit
f3b59291a6
1 changed files with 1 additions and 19 deletions
|
@ -1636,15 +1636,6 @@ static void mpage_da_map_and_submit(struct mpage_da_data *mpd)
|
|||
|
||||
for (i = 0; i < map.m_len; i++)
|
||||
unmap_underlying_metadata(bdev, map.m_pblk + i);
|
||||
|
||||
if (ext4_should_order_data(mpd->inode)) {
|
||||
err = ext4_jbd2_file_inode(handle, mpd->inode);
|
||||
if (err) {
|
||||
/* Only if the journal is aborted */
|
||||
mpd->retval = err;
|
||||
goto submit_io;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -2592,17 +2583,8 @@ static int ext4_da_write_end(struct file *file,
|
|||
if (copied && new_i_size > EXT4_I(inode)->i_disksize) {
|
||||
if (ext4_da_should_update_i_disksize(page, end)) {
|
||||
down_write(&EXT4_I(inode)->i_data_sem);
|
||||
if (new_i_size > EXT4_I(inode)->i_disksize) {
|
||||
/*
|
||||
* Updating i_disksize when extending file
|
||||
* without needing block allocation
|
||||
*/
|
||||
if (ext4_should_order_data(inode))
|
||||
ret = ext4_jbd2_file_inode(handle,
|
||||
inode);
|
||||
|
||||
if (new_i_size > EXT4_I(inode)->i_disksize)
|
||||
EXT4_I(inode)->i_disksize = new_i_size;
|
||||
}
|
||||
up_write(&EXT4_I(inode)->i_data_sem);
|
||||
/* We need to mark inode dirty even if
|
||||
* new_i_size is less that inode->i_size
|
||||
|
|
Loading…
Reference in a new issue