[02/20] sd: switch to using blk_queue_write_cache()
diff mbox

Message ID 1460486175-25724-3-git-send-email-axboe@fb.com
State New
Headers show

Commit Message

Jens Axboe April 12, 2016, 6:35 p.m. UTC
Switch to the newer interface, instead of using blk_queue_flush()
directly.

Signed-off-by: Jens Axboe <axboe@fb.com>
---
 drivers/scsi/sd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Martin K. Petersen April 12, 2016, 9:57 p.m. UTC | #1
>>>>> "Jens" == Jens Axboe <axboe@fb.com> writes:

Jens> Switch to the newer interface, instead of using blk_queue_flush()
Jens> directly.

Nice cleanup!

Acked-by: Martin K. Petersen <martin.petersen@oracle.com>

Patch
diff mbox

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index f52b74cf8d1e..ff3b7e65843c 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -137,15 +137,15 @@  static const char *sd_cache_types[] = {
 
 static void sd_set_flush_flag(struct scsi_disk *sdkp)
 {
-	unsigned flush = 0;
+	bool wc = false, fua = false;
 
 	if (sdkp->WCE) {
-		flush |= REQ_FLUSH;
+		wc = true;
 		if (sdkp->DPOFUA)
-			flush |= REQ_FUA;
+			fua = true;
 	}
 
-	blk_queue_flush(sdkp->disk->queue, flush);
+	blk_queue_write_cache(sdkp->disk->queue, wc, fua);
 }
 
 static ssize_t