aboutsummaryrefslogtreecommitdiff
path: root/fs/ext4/inline.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2017-01-11 22:14:49 -0500
committerTheodore Ts'o <tytso@mit.edu>2017-01-11 22:14:49 -0500
commitb907f2d5194c2636623415d89cfb91d692af0629 (patch)
tree9ee344855c6b41d9a3641d7ac5aa6a3dcb363ae4 /fs/ext4/inline.c
parentc755e251357a0cee0679081f08c3f4ba797a8009 (diff)
downloadlinux-stericsson-b907f2d5194c2636623415d89cfb91d692af0629.tar.gz
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: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/inline.c')
-rw-r--r--fs/ext4/inline.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 99a5312ced52..31f98dd04e51 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1042,7 +1042,6 @@ static int ext4_add_dirent_to_inline(handle_t *handle,
dir->i_mtime = dir->i_ctime = current_time(dir);
ext4_update_dx_flag(dir);
dir->i_version++;
- ext4_mark_inode_dirty(handle, dir);
return 1;
}
@@ -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);
out:
- ext4_mark_inode_dirty(handle, dir);
ext4_write_unlock_xattr(dir, &no_expand);
+ ext4_mark_inode_dirty(handle, dir);
brelse(iloc.bh);
return ret;
}
@@ -1708,13 +1707,11 @@ int ext4_delete_inline_entry(handle_t *handle,
if (err)
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);
out:
ext4_write_unlock_xattr(dir, &no_expand);
+ if (likely(err == 0))
+ err = ext4_mark_inode_dirty(handle, dir);
brelse(iloc.bh);
if (err != -ENOENT)
ext4_std_error(dir->i_sb, err);