go away

rincebrain · rincebrain · commit 2e9c9b792fd3 · 2023-03-23T06:49:04.000-04:00
diff --git a/config/kernel-generic_io_acct.m4 b/config/kernel-generic_io_acct.m4
@@ -11,7 +11,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_GENERIC_IO_ACCT], [
 		unsigned long start_time;
 
 		start_time = bdev_start_io_acct(bdev, bio_op(bio),
-		    bio_sectors(bio), passed_time);
+		    passed_time);
 		bdev_end_io_acct(bdev, bio_op(bio), bio_sectors(bio), start_time);
 	])
 
@@ -92,6 +92,7 @@ AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT], [
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_BDEV_IO_ACCT_OLD, 1, [bdev_*_io_acct() available])
 		], [
+		AC_MSG_RESULT(no)
 		dnl #
 		dnl # 5.12 API,
 		dnl #
diff --git a/include/os/linux/kernel/linux/blkdev_compat.h b/include/os/linux/kernel/linux/blkdev_compat.h
@@ -594,7 +594,7 @@ blk_generic_start_io_acct(struct request_queue *q __attribute__((unused)),
 {
 #if defined(HAVE_BDEV_IO_ACCT_62)
 	return (bdev_start_io_acct(bio->bi_bdev, bio_op(bio),
-	    bio_sectors(bio), jiffies));
+	    jiffies));
 #elif defined(HAVE_BDEV_IO_ACCT_OLD)
 	return (bdev_start_io_acct(bio->bi_bdev, bio_sectors(bio),
 	    bio_op(bio), jiffies));

Original file line number	Diff line number	Diff line change
`@@ -594,7 +594,7 @@ blk_generic_start_io_acct(struct request_queue *q __attribute__((unused)),`
`594`	`594`	`{`
`595`	`595`	`#if defined(HAVE_BDEV_IO_ACCT_62)`
`596`	`596`	`return (bdev_start_io_acct(bio->bi_bdev, bio_op(bio),`
`597`		`- bio_sectors(bio), jiffies));`
	`597`	`+ jiffies));`
`598`	`598`	`#elif defined(HAVE_BDEV_IO_ACCT_OLD)`
`599`	`599`	`return (bdev_start_io_acct(bio->bi_bdev, bio_sectors(bio),`
`600`	`600`	`bio_op(bio), jiffies));`