File 0002-oracleasm-Kernel-interface-tweaks-for-4.14... of Package oracleasm.16079

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-oracleasm-Kernel-interface-tweaks-for-4.14.patch of Package oracleasm.16079

From 3fbc3ca97b361c66c0d82111e5ab833ffd4ffd3c Mon Sep 17 00:00:00 2001
From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: Mon, 13 Nov 2017 14:52:16 -0500
Subject: [PATCH 2/2] oracleasm: Kernel interface tweaks for 4.14

bio errors are now in bi_status and bi_bdev has been replaced with a
gendisk pointer.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---
 drivers/block/oracleasm/driver.c    |  4 ++--
 drivers/block/oracleasm/integrity.c |  2 +-
 drivers/block/oracleasm/trace.h     | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/block/oracleasm/driver.c b/drivers/block/oracleasm/driver.c
index d985629..b63139c 100644
--- a/drivers/block/oracleasm/driver.c
+++ b/drivers/block/oracleasm/driver.c
@@ -1111,7 +1111,7 @@ static void asm_end_bio_io(struct bio *bio)
 	if (atomic_dec_and_test(&r->r_bio_count)) {
 		asm_end_ioc(r, r->r_count - (r->r_bio ?
 					     r->r_bio->bi_iter.bi_size : 0),
-			    bio->bi_error);
+			    bio->bi_status);
 	}
 }  /* asm_end_bio_io() */
 
@@ -1248,7 +1248,7 @@ static int asm_submit_io(struct file *file,
 	}
 
 	r->r_bio->bi_opf = rw;
-	r->r_bio->bi_bdev = bdev;
+	bio_set_dev(r->r_bio, bdev);
 
 	if (r->r_bio->bi_iter.bi_size != r->r_count) {
 		pr_err("%s: Only mapped partial ioc buffer\n", __func__);
diff --git a/drivers/block/oracleasm/integrity.c b/drivers/block/oracleasm/integrity.c
index 9d4251b..e78af26 100644
--- a/drivers/block/oracleasm/integrity.c
+++ b/drivers/block/oracleasm/integrity.c
@@ -143,7 +143,7 @@ int asm_integrity_map(struct oracleasm_integrity_v2 *it, struct asm_request *r,
 	}
 
 	bip->bip_iter.bi_size = len;
-	bip->bip_iter.bi_sector = bio->bi_iter.bi_sector;
+	bip_set_seed(bip, bio->bi_iter.bi_sector);
 
 	/* This is a retry. Prevent reference tag from being remapped again */
 	if (it->it_flags & ASM_IFLAG_REMAPPED)
diff --git a/drivers/block/oracleasm/trace.h b/drivers/block/oracleasm/trace.h
index 272260e..c344ff7 100644
--- a/drivers/block/oracleasm/trace.h
+++ b/drivers/block/oracleasm/trace.h
@@ -109,20 +109,20 @@ TRACE_EVENT(bio,
 		__field(void *		, bio		)
 		__field(dev_t		, dev		)
 		__field(void *		, req		)
-		__field(int		, error		)
+		__field(int		, status	)
 	),
 
 	TP_fast_assign(
 		__assign_str(action, action);
 		__entry->bio		= bio;
-		__entry->dev		= bio->bi_bdev ? bio->bi_bdev->bd_dev : 0;
+		__entry->dev		= bio_dev(bio);
 		__entry->req		= bio->bi_private;
-		__entry->error	        = bio->bi_error;
+		__entry->status	        = bio->bi_status;
 	),
 
-	TP_printk("%-10s bio=%p dev=%u:%u req=%p error=%d",
+	TP_printk("%-10s bio=%p dev=%u:%u req=%p status=%d",
 		  __get_str(action), __entry->bio, MAJOR(__entry->dev),
-		  MINOR(__entry->dev), __entry->req, __entry->error)
+		  MINOR(__entry->dev), __entry->req, __entry->status)
 );
 
 TRACE_EVENT(ioc,
-- 
2.7.4

Places

File 0002-oracleasm-Kernel-interface-tweaks-for-4.14.patch of Package oracleasm.16079

Places