Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 903117 | Differences between
and this patch

Collapse All | Expand All

(-)a/include/os/linux/kernel/linux/blkdev_compat.h (-2 / +8 lines)
Lines 555-561 Link Here
555
    struct gendisk *disk __attribute__((unused)),
555
    struct gendisk *disk __attribute__((unused)),
556
    int rw __attribute__((unused)), struct bio *bio)
556
    int rw __attribute__((unused)), struct bio *bio)
557
{
557
{
558
#if defined(HAVE_BDEV_IO_ACCT)
558
#if defined(HAVE_BDEV_IO_ACCT_63)
559
	return (bdev_start_io_acct(bio->bi_bdev, bio_op(bio),
560
	    jiffies));
561
#elif defined(HAVE_BDEV_IO_ACCT_OLD)
559
	return (bdev_start_io_acct(bio->bi_bdev, bio_sectors(bio),
562
	return (bdev_start_io_acct(bio->bi_bdev, bio_sectors(bio),
560
	    bio_op(bio), jiffies));
563
	    bio_op(bio), jiffies));
561
#elif defined(HAVE_DISK_IO_ACCT)
564
#elif defined(HAVE_DISK_IO_ACCT)
Lines 581-587 Link Here
581
    struct gendisk *disk __attribute__((unused)),
584
    struct gendisk *disk __attribute__((unused)),
582
    int rw __attribute__((unused)), struct bio *bio, unsigned long start_time)
585
    int rw __attribute__((unused)), struct bio *bio, unsigned long start_time)
583
{
586
{
584
#if defined(HAVE_BDEV_IO_ACCT)
587
#if defined(HAVE_BDEV_IO_ACCT_63)
588
	bdev_end_io_acct(bio->bi_bdev, bio_op(bio), bio_sectors(bio),
589
	    start_time);
590
#elif defined(HAVE_BDEV_IO_ACCT_OLD)
585
	bdev_end_io_acct(bio->bi_bdev, bio_op(bio), start_time);
591
	bdev_end_io_acct(bio->bi_bdev, bio_op(bio), start_time);
586
#elif defined(HAVE_DISK_IO_ACCT)
592
#elif defined(HAVE_DISK_IO_ACCT)
587
	disk_end_io_acct(disk, bio_op(bio), start_time);
593
	disk_end_io_acct(disk, bio_op(bio), start_time);

Return to bug 903117