]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
oracleasm: Add missing tracepoint
authorMartin K. Petersen <martin.petersen@oracle.com>
Wed, 8 Aug 2018 12:04:33 +0000 (08:04 -0400)
committerBrian Maly <brian.maly@oracle.com>
Wed, 15 Aug 2018 19:55:20 +0000 (15:55 -0400)
Orabug: 28506080

The tracepoint for bio mapping got dropped during the merge. Reinstate
it.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/block/oracleasm/driver.c

index 687360ff931acdf52162c428d92464213fd18f01..6fad87906d4a150d40f0e450064a872246094eb0 100644 (file)
@@ -1230,6 +1230,7 @@ static int asm_submit_io(struct file *file,
                goto out_error;
        }
 
+       r->r_bio->bi_private = r;
        r->r_bio->bi_bdev = bdev;
 
        if (r->r_bio->bi_iter.bi_size != r->r_count) {
@@ -1240,6 +1241,8 @@ static int asm_submit_io(struct file *file,
                goto out_error;
        }
 
+       trace_bio(r->r_bio, 0, "map");
+
        /* Block layer always uses 512-byte sector addressing,
         * regardless of logical and physical block size.
         */
@@ -1263,7 +1266,6 @@ static int asm_submit_io(struct file *file,
         * end_io on the child "real" bio
         */
        r->r_bio->bi_end_io = asm_end_bio_io;
-       r->r_bio->bi_private = r;
 
        r->r_elapsed = jiffies;  /* Set start time */