Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
This commit is contained in:
commit
5b0d1812b5
|
@ -1259,7 +1259,6 @@ EXPORT_SYMBOL(dmu_object_size_from_db);
|
||||||
EXPORT_SYMBOL(dmu_object_set_blocksize);
|
EXPORT_SYMBOL(dmu_object_set_blocksize);
|
||||||
EXPORT_SYMBOL(dmu_object_set_checksum);
|
EXPORT_SYMBOL(dmu_object_set_checksum);
|
||||||
EXPORT_SYMBOL(dmu_object_set_compress);
|
EXPORT_SYMBOL(dmu_object_set_compress);
|
||||||
EXPORT_SYMBOL(dmu_get_replication_level);
|
|
||||||
|
|
||||||
EXPORT_SYMBOL(dmu_ot);
|
EXPORT_SYMBOL(dmu_ot);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -3149,6 +3149,4 @@ EXPORT_SYMBOL(dsl_dataset_check_quota);
|
||||||
EXPORT_SYMBOL(dsl_dataset_set_quota);
|
EXPORT_SYMBOL(dsl_dataset_set_quota);
|
||||||
EXPORT_SYMBOL(dsl_dataset_set_quota_sync);
|
EXPORT_SYMBOL(dsl_dataset_set_quota_sync);
|
||||||
EXPORT_SYMBOL(dsl_dataset_set_reservation);
|
EXPORT_SYMBOL(dsl_dataset_set_reservation);
|
||||||
EXPORT_SYMBOL(dsl_dataset_set_flags);
|
|
||||||
EXPORT_SYMBOL(dsl_dataset_new_refreservation);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -173,3 +173,9 @@ zfs_znode_byteswap(void *buf, size_t size)
|
||||||
zfs_oldace_byteswap((ace_t *)&zp->zp_acl.z_ace_data[0],
|
zfs_oldace_byteswap((ace_t *)&zp->zp_acl.z_ace_data[0],
|
||||||
ACE_SLOT_CNT);
|
ACE_SLOT_CNT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||||
|
EXPORT_SYMBOL(zfs_oldacl_byteswap);
|
||||||
|
EXPORT_SYMBOL(zfs_acl_byteswap);
|
||||||
|
EXPORT_SYMBOL(zfs_znode_byteswap);
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue