X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fvdev_disk.c;fp=module%2Fzfs%2Fvdev_disk.c;h=e902a70e19db9142fc3413ee1939872ff44d89dd;hb=d9b0ebbe824469d178a05b0fb9004e4afce86009;hp=cbf0a4d4fb0896c74f34ceeb4899d2f91675eea5;hpb=d75af3c0ebb4e31ece087aeecfeff282cb6f1361;p=zfs.git diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c index cbf0a4d..e902a70 100644 --- a/module/zfs/vdev_disk.c +++ b/module/zfs/vdev_disk.c @@ -604,8 +604,6 @@ vdev_disk_physio(struct block_device *bdev, caddr_t kbuf, return __vdev_disk_physio(bdev, NULL, kbuf, size, offset, flags); } -/* 2.6.24 API change */ -#ifdef HAVE_BIO_EMPTY_BARRIER BIO_END_IO_PROTO(vdev_disk_io_flush_completion, bio, size, rc) { zio_t *zio = bio->bi_private; @@ -646,13 +644,6 @@ vdev_disk_io_flush(struct block_device *bdev, zio_t *zio) return 0; } -#else -static int -vdev_disk_io_flush(struct block_device *bdev, zio_t *zio) -{ - return ENOTSUP; -} -#endif /* HAVE_BIO_EMPTY_BARRIER */ static int vdev_disk_io_start(zio_t *zio)