diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2018-03-22 11:52:10 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-03-22 11:52:10 -0400 |
| commit | 1d39834fba99c48edd3d4887ccd474da61a1ada7 (patch) | |
| tree | 7a5c924c7c87ec9c372aa20f908b1c52790b5d3f /fs/ext4/super.c | |
| parent | fe23cb65c2c394ea306f3714a17d46ab2e6a0af1 (diff) | |
| download | linux-stable-1d39834fba99c48edd3d4887ccd474da61a1ada7.tar.gz linux-stable-1d39834fba99c48edd3d4887ccd474da61a1ada7.tar.bz2 linux-stable-1d39834fba99c48edd3d4887ccd474da61a1ada7.zip | |
ext4: remove EXT4_STATE_DIOREAD_LOCK flag
Commit 16c54688592c ("ext4: Allow parallel DIO reads") reworked the way
locking happens around parallel dio reads. This resulted in obviating
the need for EXT4_STATE_DIOREAD_LOCK flag and accompanying logic.
Currently this amounts to dead code so let's remove it. No functional
changes
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 756f515b762d..3a13b7b24616 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -101,15 +101,13 @@ static struct inode *ext4_get_journal_inode(struct super_block *sb, * i_data_sem (rw) * * truncate: - * sb_start_write -> i_mutex -> EXT4_STATE_DIOREAD_LOCK (w) -> i_mmap_sem (w) -> - * i_mmap_rwsem (w) -> page lock - * sb_start_write -> i_mutex -> EXT4_STATE_DIOREAD_LOCK (w) -> i_mmap_sem (w) -> - * transaction start -> i_data_sem (rw) + * sb_start_write -> i_mutex -> i_mmap_sem (w) -> i_mmap_rwsem (w) -> page lock + * sb_start_write -> i_mutex -> i_mmap_sem (w) -> transaction start -> + * i_data_sem (rw) * * direct IO: - * sb_start_write -> i_mutex -> EXT4_STATE_DIOREAD_LOCK (r) -> mmap_sem - * sb_start_write -> i_mutex -> EXT4_STATE_DIOREAD_LOCK (r) -> - * transaction start -> i_data_sem (rw) + * sb_start_write -> i_mutex -> mmap_sem + * sb_start_write -> i_mutex -> transaction start -> i_data_sem (rw) * * writepages: * transaction start -> page lock(s) -> i_data_sem (rw) |