diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-11-22 16:44:07 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-12-04 17:39:06 +0100 |
| commit | 154989e45fd8de9bfb52bbd6e5ea763e437e54c5 (patch) | |
| tree | bdd6f554d244c0142238a7306a7eff0ccdfe0e7f /fs/aio.c | |
| parent | Merge tag 'v4.20-rc5' into for-4.21/block (diff) | |
| download | linux-154989e45fd8de9bfb52bbd6e5ea763e437e54c5.tar.xz linux-154989e45fd8de9bfb52bbd6e5ea763e437e54c5.zip | |
aio: clear IOCB_HIPRI
No one is going to poll for aio (yet), so we must clear the HIPRI
flag, as we would otherwise send it down the poll queues, where no
one will be polling for completions.
Signed-off-by: Christoph Hellwig <hch@lst.de>
IOCB_HIPRI, not RWF_HIPRI.
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/aio.c')
| -rw-r--r-- | fs/aio.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -1436,8 +1436,7 @@ static int aio_prep_rw(struct kiocb *req, struct iocb *iocb) ret = ioprio_check_cap(iocb->aio_reqprio); if (ret) { pr_debug("aio ioprio check cap error: %d\n", ret); - fput(req->ki_filp); - return ret; + goto out_fput; } req->ki_ioprio = iocb->aio_reqprio; @@ -1446,7 +1445,13 @@ static int aio_prep_rw(struct kiocb *req, struct iocb *iocb) ret = kiocb_set_rw_flags(req, iocb->aio_rw_flags); if (unlikely(ret)) - fput(req->ki_filp); + goto out_fput; + + req->ki_flags &= ~IOCB_HIPRI; /* no one is going to poll for this I/O */ + return 0; + +out_fput: + fput(req->ki_filp); return ret; } |