diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-08 01:38:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-08 01:38:45 +0200 |
| commit | 857953d72f3744f325de93320cc2673795e9ca89 (patch) | |
| tree | b4253224fd74148708bd1fb210e4155e22ee7b63 /mm/filemap.c | |
| parent | Merge tag 'drm-for-v4.8-zpos' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | block: rename bio bi_rw to bi_opf (diff) | |
| download | linux-857953d72f3744f325de93320cc2673795e9ca89.tar.xz 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 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index daef091d4c50..8a287dfc5372 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -887,9 +887,9 @@ EXPORT_SYMBOL(end_page_writeback); * After completing I/O on a page, call this routine to update the page * flags appropriately */ -void page_endio(struct page *page, int op, int err) +void page_endio(struct page *page, bool is_write, int err) { - if (!op_is_write(op)) { + if (!is_write) { if (!err) { SetPageUptodate(page); } else { |