Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "io_uring/rw: fix missing NOWAIT check for O_DIRECT start write"

Browse source 
This reverts commit bb5321e6e0.
This commit is contained in:
Ksawlii 2024-12-13 19:44:18 +01:00
parent c09929ddba
commit 4ae2ca820d
1 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
io_uring/io_uring.c
View file

@ -3738,25 +3738,6 @@ static int io_write_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
return io_prep_rw(req, sqe, WRITE); return io_prep_rw(req, sqe, WRITE);
} }
static bool io_kiocb_start_write(struct io_kiocb *req, struct kiocb *kiocb)
{
struct inode *inode;
bool ret;
if (!(req->flags & REQ_F_ISREG))
return true;
if (!(kiocb->ki_flags & IOCB_NOWAIT)) {
kiocb_start_write(kiocb);
return true;
}
inode = file_inode(kiocb->ki_filp);
ret = sb_start_write_trylock(inode->i_sb);
if (ret)
__sb_writers_release(inode->i_sb, SB_FREEZE_WRITE);
return ret;
}
static int io_write(struct io_kiocb *req, unsigned int issue_flags) static int io_write(struct io_kiocb *req, unsigned int issue_flags)
{ {
struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs; struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;
@ -3803,8 +3784,8 @@ static int io_write(struct io_kiocb *req, unsigned int issue_flags)
if (unlikely(ret)) if (unlikely(ret))
goto out_free; goto out_free;
if (unlikely(!io_kiocb_start_write(req, kiocb))) if (req->flags & REQ_F_ISREG)
goto copy_iov; kiocb_start_write(kiocb);
kiocb->ki_flags |= IOCB_WRITE; kiocb->ki_flags |= IOCB_WRITE;
if (req->file->f_op->write_iter) if (req->file->f_op->write_iter)