lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 331/388] ext4: don't block for O_DIRECT if IOCB_NOWAIT is set
    Date
    From: Jens Axboe <axboe@kernel.dk>

    [ Upstream commit 6e014c621e7271649f0d51e54dbe1db4c10486c8 ]

    Running with some debug patches to detect illegal blocking triggered the
    extend/unaligned condition in ext4. If ext4 needs to extend the file (and
    hence go to buffered IO), or if the app is doing unaligned IO, then ext4
    asks the iomap code to wait for IO completion. If the caller asked for
    no-wait semantics by setting IOCB_NOWAIT, then ext4 should return -EAGAIN
    instead.

    Signed-off-by: Jens Axboe <axboe@kernel.dk>

    Link: https://lore.kernel.org/r/76152096-2bbb-7682-8fce-4cb498bcd909@kernel.dk
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/ext4/file.c | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/fs/ext4/file.c b/fs/ext4/file.c
    index b8e69f9e3858..2a01e31a032c 100644
    --- a/fs/ext4/file.c
    +++ b/fs/ext4/file.c
    @@ -502,6 +502,12 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from)
    if (ret <= 0)
    return ret;

    + /* if we're going to block and IOCB_NOWAIT is set, return -EAGAIN */
    + if ((iocb->ki_flags & IOCB_NOWAIT) && (unaligned_io || extend)) {
    + ret = -EAGAIN;
    + goto out;
    + }
    +
    offset = iocb->ki_pos;
    count = ret;

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 04:34    [W:4.075 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site