From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jun 2018 17:00:20 +0000 (-0700)
Subject: Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4a189982e293e662d719f5dd3ba6eec247d7bbc2;p=linux.git

Merge branch 'work.aio' of git://git./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
---

4a189982e293e662d719f5dd3ba6eec247d7bbc2
diff --cc fs/iomap.c
index 206539d369a84,65aae194aecaa..7d1e9f45f098c
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@@ -1044,8 -916,10 +1044,9 @@@ iomap_dio_actor(struct inode *inode, lo
  
  		bio = bio_alloc(GFP_KERNEL, nr_pages);
  		bio_set_dev(bio, iomap->bdev);
 -		bio->bi_iter.bi_sector =
 -			(iomap->addr + pos - iomap->offset) >> 9;
 +		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;