Revert "io_uring: gate REQ_F_ISREG on !S_ANON_INODE as well"
Jens Axboe
maintainerPATCH 1/1 Revert "io_uring: gate REQ_F_ISREG on !S_ANON_INODE as well"
This reverts commit 6f11adcc6f36ffd8f33dbdf5f5ce073368975bc3.
The problematic commit was fixed in mainline, so the work-around in io_uring can be removed at this point. Anonymous inodes no longer pretend to be regular files after:
1e7ab6f67824 ("anon_inode: rework assertions")
Signed-off-by Jens Axboe <[email protected]>
---
io_uring/io_uring.c +1 -2
@@ -1666,12 +1666,11 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags)io_req_flags_t io_file_get_flags (struct file *file) { -struct inode *inode =file_inode (file);io_req_flags_t res =0 ;BUILD_BUG_ON (REQ_F_ISREG_BIT !=REQ_F_SUPPORT_NOWAIT_BIT +1 ); -if (S_ISREG (inode->i_mode) && !(inode->i_flags &S_ANON_INODE )) +if (S_ISREG (file_inode (file)->i_mode)) res |=REQ_F_ISREG ;if ((file->f_flags &O_NONBLOCK ) || (file->f_mode &FMODE_NOWAIT )) res |=REQ_F_SUPPORT_NOWAIT ;
Signature · 1 line
Jens Axboe