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 /fs/iomap.c | |
| parent | 4189b863ba327bac4a869773aea4995f7716945a (diff) | |
| parent | 9a6d9a62e0fd4b9927c3124db0f25fc6b4fb6576 (diff) | |
| download | linux-stable-4a189982e293e662d719f5dd3ba6eec247d7bbc2.tar.gz linux-stable-4a189982e293e662d719f5dd3ba6eec247d7bbc2.tar.bz2 linux-stable-4a189982e293e662d719f5dd3ba6eec247d7bbc2.zip | |
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 'fs/iomap.c')
| -rw-r--r-- | fs/iomap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/iomap.c b/fs/iomap.c index 206539d369a8..7d1e9f45f098 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -1046,6 +1046,7 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length, bio_set_dev(bio, iomap->bdev); bio->bi_iter.bi_sector = iomap_sector(iomap, pos); bio->bi_write_hint = dio->iocb->ki_hint; + bio->bi_ioprio = dio->iocb->ki_ioprio; bio->bi_private = dio; bio->bi_end_io = iomap_dio_bio_end_io; |