diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-08 10:00:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-08 10:00:20 -0700 |
| commit | 4a189982e293e662d719f5dd3ba6eec247d7bbc2 (patch) | |
| tree | a2384a2e4f56999a15fa80f0a07bff9fe23597f3 /drivers | |
| parent | 4189b863ba327bac4a869773aea4995f7716945a (diff) | |
| parent | 9a6d9a62e0fd4b9927c3124db0f25fc6b4fb6576 (diff) | |
| download | linux-4a189982e293e662d719f5dd3ba6eec247d7bbc2.tar.bz2 | |
Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull aio iopriority support from Al Viro:
"The rest of aio stuff for this cycle - Adam's aio ioprio series"
* 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs: aio ioprio use ioprio_check_cap ret val
fs: aio ioprio add explicit block layer dependence
fs: iomap dio set bio prio from kiocb prio
fs: blkdev set bio prio from kiocb prio
fs: Add aio iopriority support
fs: Convert kiocb rw_hint from enum to u16
block: add ioprio_check_cap function
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/loop.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 4838b0dbaad3..3ce607006c44 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -76,6 +76,8 @@ #include <linux/miscdevice.h> #include <linux/falloc.h> #include <linux/uio.h> +#include <linux/ioprio.h> + #include "loop.h" #include <linux/uaccess.h> @@ -559,6 +561,7 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, cmd->iocb.ki_filp = file; cmd->iocb.ki_complete = lo_rw_aio_complete; cmd->iocb.ki_flags = IOCB_DIRECT; + cmd->iocb.ki_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, 0); if (cmd->css) kthread_associate_blkcg(cmd->css); |