git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the bio_empty_barrier() check.
[zfs.git]
/
module
/
zfs
/
vdev_disk.c
diff --git
a/module/zfs/vdev_disk.c
b/module/zfs/vdev_disk.c
index
cbf0a4d
..
e902a70
100644
(file)
--- 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);
}
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;
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;
}
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)
static int
vdev_disk_io_start(zio_t *zio)