Commit b907f2d5 authored by Theodore Ts'o's avatar Theodore Ts'o

ext4: avoid calling ext4_mark_inode_dirty() under unneeded semaphores

There is no need to call ext4_mark_inode_dirty while holding xattr_sem
or i_data_sem, so where it's easy to avoid it, move it out from the
critical region.
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent c755e251
...@@ -1042,7 +1042,6 @@ static int ext4_add_dirent_to_inline(handle_t *handle, ...@@ -1042,7 +1042,6 @@ static int ext4_add_dirent_to_inline(handle_t *handle,
dir->i_mtime = dir->i_ctime = current_time(dir); dir->i_mtime = dir->i_ctime = current_time(dir);
ext4_update_dx_flag(dir); ext4_update_dx_flag(dir);
dir->i_version++; dir->i_version++;
ext4_mark_inode_dirty(handle, dir);
return 1; return 1;
} }
...@@ -1311,8 +1310,8 @@ int ext4_try_add_inline_entry(handle_t *handle, struct ext4_filename *fname, ...@@ -1311,8 +1310,8 @@ int ext4_try_add_inline_entry(handle_t *handle, struct ext4_filename *fname,
ret = ext4_convert_inline_data_nolock(handle, dir, &iloc); ret = ext4_convert_inline_data_nolock(handle, dir, &iloc);
out: out:
ext4_mark_inode_dirty(handle, dir);
ext4_write_unlock_xattr(dir, &no_expand); ext4_write_unlock_xattr(dir, &no_expand);
ext4_mark_inode_dirty(handle, dir);
brelse(iloc.bh); brelse(iloc.bh);
return ret; return ret;
} }
...@@ -1708,13 +1707,11 @@ int ext4_delete_inline_entry(handle_t *handle, ...@@ -1708,13 +1707,11 @@ int ext4_delete_inline_entry(handle_t *handle,
if (err) if (err)
goto out; goto out;
err = ext4_mark_inode_dirty(handle, dir);
if (unlikely(err))
goto out;
ext4_show_inline_dir(dir, iloc.bh, inline_start, inline_size); ext4_show_inline_dir(dir, iloc.bh, inline_start, inline_size);
out: out:
ext4_write_unlock_xattr(dir, &no_expand); ext4_write_unlock_xattr(dir, &no_expand);
if (likely(err == 0))
err = ext4_mark_inode_dirty(handle, dir);
brelse(iloc.bh); brelse(iloc.bh);
if (err != -ENOENT) if (err != -ENOENT)
ext4_std_error(dir->i_sb, err); ext4_std_error(dir->i_sb, err);
......
...@@ -2464,8 +2464,8 @@ static int mpage_map_and_submit_extent(handle_t *handle, ...@@ -2464,8 +2464,8 @@ static int mpage_map_and_submit_extent(handle_t *handle,
disksize = i_size; disksize = i_size;
if (disksize > EXT4_I(inode)->i_disksize) if (disksize > EXT4_I(inode)->i_disksize)
EXT4_I(inode)->i_disksize = disksize; EXT4_I(inode)->i_disksize = disksize;
err2 = ext4_mark_inode_dirty(handle, inode);
up_write(&EXT4_I(inode)->i_data_sem); up_write(&EXT4_I(inode)->i_data_sem);
err2 = ext4_mark_inode_dirty(handle, inode);
if (err2) if (err2)
ext4_error(inode->i_sb, ext4_error(inode->i_sb,
"Failed to mark inode %lu dirty", "Failed to mark inode %lu dirty",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment