diff options
| author | Brian Behlendorf <[email protected]> | 2011-02-22 12:15:13 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-02-23 12:29:38 -0800 |
| commit | 61e909608d15dc6900a710a0ceab6e101a68ac5a (patch) | |
| tree | 0786db6d6de1bd8d2fe39f7c2039007b72203351 /include/sys/dmu.h | |
| parent | 075cf6cb72a460d884c29085413c3ea16a62d32d (diff) | |
Linux 2.6.x compat, blkdev_compat.h
For legacy reasons the zvol.c and vdev_disk.c Linux compatibility
code ended up in sys/blkdev.h and sys/vdev_disk.h headers. While
there are worse places for this code to live it should be in a
linux/blkdev_compat.h header. This change moves this block device
Linux compatibility code in to the linux/blkdev_compat.h header
and updates all the correct #include locations. This is not a
functional change or bug fix, it is just code cleanup.
Diffstat (limited to 'include/sys/dmu.h')
| -rw-r--r-- | include/sys/dmu.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/sys/dmu.h b/include/sys/dmu.h index 7040b6740..20733f502 100644 --- a/include/sys/dmu.h +++ b/include/sys/dmu.h @@ -41,9 +41,6 @@ #include <sys/cred.h> #include <sys/time.h> #include <sys/uio.h> -#ifdef _KERNEL -#include <sys/blkdev.h> -#endif #ifdef __cplusplus extern "C" { @@ -514,6 +511,7 @@ void dmu_write(objset_t *os, uint64_t object, uint64_t offset, uint64_t size, void dmu_prealloc(objset_t *os, uint64_t object, uint64_t offset, uint64_t size, dmu_tx_t *tx); #ifdef _KERNEL +#include <linux/blkdev_compat.h> int dmu_read_req(objset_t *os, uint64_t object, struct request *req); int dmu_write_req(objset_t *os, uint64_t object, struct request *req, dmu_tx_t *tx); |