Skip to content

Commit bc6385d

Browse files
riteshharjanitytso
authored andcommitted
ext4: Move to shared i_rwsem even without dioread_nolock mount opt
We were using shared locking only in case of dioread_nolock mount option in case of DIO overwrites. This mount condition is not needed anymore with current code, since:- 1. No race between buffered writes & DIO overwrites. Since buffIO writes takes exclusive lock & DIO overwrites will take shared locking. Also DIO path will make sure to flush and wait for any dirty page cache data. 2. No race between buffered reads & DIO overwrites, since there is no block allocation that is possible with DIO overwrites. So no stale data exposure should happen. Same is the case between DIO reads & DIO overwrites. 3. Also other paths like truncate is protected, since we wait there for any DIO in flight to be over. Reviewed-by: Jan Kara <[email protected]> Tested-by: Joseph Qi <[email protected]> Signed-off-by: Ritesh Harjani <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent aa9714d commit bc6385d

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

fs/ext4/file.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,8 @@ static const struct iomap_dio_ops ext4_dio_write_ops = {
392392
* - For extending writes case we don't take the shared lock, since it requires
393393
* updating inode i_disksize and/or orphan handling with exclusive lock.
394394
*
395-
* - shared locking will only be true mostly with overwrites in dioread_nolock
396-
* mode. Otherwise we will switch to exclusive i_rwsem lock.
395+
* - shared locking will only be true mostly with overwrites. Otherwise we will
396+
* switch to exclusive i_rwsem lock.
397397
*/
398398
static ssize_t ext4_dio_write_checks(struct kiocb *iocb, struct iov_iter *from,
399399
bool *ilock_shared, bool *extend)
@@ -415,14 +415,11 @@ static ssize_t ext4_dio_write_checks(struct kiocb *iocb, struct iov_iter *from,
415415
*extend = true;
416416
/*
417417
* Determine whether the IO operation will overwrite allocated
418-
* and initialized blocks. If so, check to see whether it is
419-
* possible to take the dioread_nolock path.
420-
*
418+
* and initialized blocks.
421419
* We need exclusive i_rwsem for changing security info
422420
* in file_modified().
423421
*/
424422
if (*ilock_shared && (!IS_NOSEC(inode) || *extend ||
425-
!ext4_should_dioread_nolock(inode) ||
426423
!ext4_overwrite_io(inode, offset, count))) {
427424
inode_unlock_shared(inode);
428425
*ilock_shared = false;

0 commit comments

Comments
 (0)