diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-07 16:38:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-07 16:38:45 -0700 |
| commit | 857953d72f3744f325de93320cc2673795e9ca89 (patch) | |
| tree | b4253224fd74148708bd1fb210e4155e22ee7b63 /include/linux/pagemap.h | |
| parent | 635a4ba111e3bd0169fd549b24fe108b1f171713 (diff) | |
| parent | 1eff9d322a444245c67515edb52bc0eb68374aa8 (diff) | |
| download | kernel_replicant_linux-857953d72f3744f325de93320cc2673795e9ca89.tar.gz kernel_replicant_linux-857953d72f3744f325de93320cc2673795e9ca89.tar.bz2 kernel_replicant_linux-857953d72f3744f325de93320cc2673795e9ca89.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull more block fixes from Jens Axboe:
"As mentioned in the pull the other day, a few more fixes for this
round, all related to the bio op changes in this series.
Two fixes, and then a cleanup, renaming bio->bi_rw to bio->bi_opf. I
wanted to do that change right after or right before -rc1, so that
risk of conflict was reduced. I just rebased the series on top of
current master, and no new ->bi_rw usage has snuck in"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: rename bio bi_rw to bi_opf
target: iblock_execute_sync_cache() should use bio_set_op_attrs()
mm: make __swap_writepage() use bio_set_op_attrs()
block/mm: make bdev_ops->rw_page() take a bool for read/write
Diffstat (limited to 'include/linux/pagemap.h')
| -rw-r--r-- | include/linux/pagemap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 45786374abbd..66a1260b33de 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -510,7 +510,7 @@ static inline void wait_on_page_writeback(struct page *page) extern void end_page_writeback(struct page *page); void wait_for_stable_page(struct page *page); -void page_endio(struct page *page, int op, int err); +void page_endio(struct page *page, bool is_write, int err); /* * Add an arbitrary waiter to a page's wait queue |