ext4: Do not block RWF_NOWAIT dio write on unallocated space
Jan Kara
reviewerPATCH 1/1 ext4: Do not block RWF_NOWAIT dio write on unallocated space
Since commit 378f32bab371 ("ext4: introduce direct I/O write using iomap infrastructure") we don't properly bail out of RWF_NOWAIT direct IO write if underlying blocks are not allocated. Also ext4_dio_write_checks() does not honor RWF_NOWAIT when re-acquiring i_rwsem. Fix both issues.
--- fs/ext4/file.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/ext4/file.c +4 -0
@@ -428,6 +428,10 @@ static ssize_t ext4_dio_write_checks(struct kiocb *iocb, struct iov_iter *from,*/ if (*ilock_shared && (!IS_NOSEC (inode) || *extend || !ext4_overwrite_io (inode, offset, count))) { +if (iocb->ki_flags &IOCB_NOWAIT ) { + ret = -EAGAIN ; + goto out; + }inode_unlock_shared (inode); *ilock_shared = false;inode_lock (inode);
Signature · 1 line
2.16.4
Quoted 9 lines · Jan Kara
Since commit
378f32bab371("ext4: introduce direct I/O write using iomap infrastructure") we don't properly bail out ofRWF_NOWAITdirect IO write if underlying blocks are not allocated. Alsoext4_dio_write_checks()does not honorRWF_NOWAITwhen re-acquiringi_rwsem. Fix both issues.Fixes 378f32bab371 ("ext4: introduce direct I/O write using iomap infrastructure")Reported-by Filipe Manana <[email protected]>Signed-off-by Jan Kara <[email protected]>
LGTM, feel free to add
Quoted 20 lines
--- fs/ext4/file.c | 4 ++++ 1 file changed, 4 insertions(+)fs/ext4/file.c +4
-0@@ -428,6 +428,10 @@ static ssize_t ext4_dio_write_checks(struct kiocb *iocb, struct iov_iter *from,*/ if (*ilock_shared && (!IS_NOSEC (inode) || *extend || !ext4_overwrite_io (inode, offset, count))) { +if (iocb->ki_flags &IOCB_NOWAIT ) { + ret = -EAGAIN ; + goto out; + }inode_unlock_shared (inode); *ilock_shared = false;inode_lock (inode);
Jan Kara
reviewerQuoted 9 lines · Jan Kara
Since commit
378f32bab371("ext4: introduce direct I/O write using iomap infrastructure") we don't properly bail out ofRWF_NOWAITdirect IO write if underlying blocks are not allocated. Alsoext4_dio_write_checks()does not honorRWF_NOWAITwhen re-acquiringi_rwsem. Fix both issues.Fixes 378f32bab371 ("ext4: introduce direct I/O write using iomap infrastructure")Reported-by Filipe Manana <[email protected]>Signed-off-by Jan Kara <[email protected]>
Ted, can you please merge this patch? Thanks!
Honza
Quoted 22 lines
--- fs/ext4/file.c | 4 ++++ 1 file changed, 4 insertions(+)fs/ext4/file.c +4
-0@@ -428,6 +428,10 @@ static ssize_t ext4_dio_write_checks(struct kiocb *iocb, struct iov_iter *from,*/ if (*ilock_shared && (!IS_NOSEC (inode) || *extend || !ext4_overwrite_io (inode, offset, count))) { +if (iocb->ki_flags &IOCB_NOWAIT ) { + ret = -EAGAIN ; + goto out; + }inode_unlock_shared (inode); *ilock_shared = false;inode_lock (inode);Signature · 1 line
2.16.4
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 9 lines · Jan Kara
Since commit
378f32bab371("ext4: introduce direct I/O write using iomap infrastructure") we don't properly bail out ofRWF_NOWAITdirect IO write if underlying blocks are not allocated. Alsoext4_dio_write_checks()does not honorRWF_NOWAITwhen re-acquiringi_rwsem. Fix both issues.Fixes 378f32bab371 ("ext4: introduce direct I/O write using iomap infrastructure")Reported-by Filipe Manana <[email protected]>Signed-off-by Jan Kara <[email protected]>
Applied, thanks.
- Ted