diff options
| author | Brian Behlendorf <[email protected]> | 2010-08-26 11:56:53 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2010-08-31 13:42:00 -0700 |
| commit | d603ed6c278f9c25b17ba8e75e9bce6e5d715ac0 (patch) | |
| tree | 61dc04f07ed9772dd97faefd879412e2a6578be0 /module | |
| parent | f1fb119f6bb0c3185ec88912e4488fdd9ec08ab2 (diff) | |
Add linux user disk support
This topic branch contains all the changes needed to integrate the user
side zfs tools with Linux style devices. Primarily this includes fixing
up the Solaris libefi library to be Linux friendly, and integrating with
the libblkid library which is provided by e2fsprogs.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'module')
| -rw-r--r-- | module/zfs/sa.c | 5 | ||||
| -rw-r--r-- | module/zfs/zfs_sa.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/module/zfs/sa.c b/module/zfs/sa.c index 37b815f94..ee1140ffb 100644 --- a/module/zfs/sa.c +++ b/module/zfs/sa.c @@ -1436,6 +1436,7 @@ sa_lookup(sa_handle_t *hdl, sa_attr_type_t attr, void *buf, uint32_t buflen) int sa_lookup_uio(sa_handle_t *hdl, sa_attr_type_t attr, uio_t *uio) { +#ifdef HAVE_ZPL int error; sa_bulk_attr_t bulk; @@ -1452,7 +1453,9 @@ sa_lookup_uio(sa_handle_t *hdl, sa_attr_type_t attr, uio_t *uio) } mutex_exit(&hdl->sa_lock); return (error); - +#else + return ENOSYS; +#endif /* HAVE_ZPL */ } #endif diff --git a/module/zfs/zfs_sa.c b/module/zfs/zfs_sa.c index d141e43d7..88fd78966 100644 --- a/module/zfs/zfs_sa.c +++ b/module/zfs/zfs_sa.c @@ -67,7 +67,7 @@ sa_attr_reg_t zfs_attr_table[ZPL_END+1] = { }; #ifdef _KERNEL - +#ifdef HAVE_ZPL int zfs_sa_readlink(znode_t *zp, uio_t *uio) { @@ -331,4 +331,5 @@ zfs_sa_upgrade_txholds(dmu_tx_t *tx, znode_t *zp) } } +#endif /* HAVE_ZPL */ #endif |