From: Jens Axboe <axboe@fb.com>
Date: Mon, 1 Aug 2016 15:38:44 +0000 (-0600)
Subject: mm: make __swap_writepage() use bio_set_op_attrs()
X-Git-Tag: v4.8-rc1~1^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ba13e83ec334ca8a1c6bec882a6efc98d8bf355d;p=uclinux-h8%2Flinux.git

mm: make __swap_writepage() use bio_set_op_attrs()

Cleaner than manipulating bio->bi_rw flags directly.

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/mm/page_io.c b/mm/page_io.c
index fb1fa269d3a0..16bd82fad38c 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -319,9 +319,10 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
 		ret = -ENOMEM;
 		goto out;
 	}
-	bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
 	if (wbc->sync_mode == WB_SYNC_ALL)
-		bio->bi_rw |= REQ_SYNC;
+		bio_set_op_attrs(bio, REQ_OP_WRITE, REQ_SYNC);
+	else
+		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
 	count_vm_event(PSWPOUT);
 	set_page_writeback(page);
 	unlock_page(page);