From e16ffab3027820bee993fc1a0e9662a9e9dba0a2 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 10 Jul 2009 11:37:30 -0700 Subject: [PATCH 1/3] SPLBUILD now includes modules --- scripts/zfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zfs.sh b/scripts/zfs.sh index 35c29b67df..df1c782a52 100755 --- a/scripts/zfs.sh +++ b/scripts/zfs.sh @@ -14,7 +14,7 @@ KERNEL_MODULES=( \ ) SPL_MODULES=( \ - ${SPLBUILD}/module/spl/spl.ko \ + ${SPLBUILD}/spl/spl.ko \ ) ZFS_MODULES=( \ From 8bb9b8305a6a499115d6a4fcc46060a318fea205 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 10 Jul 2009 11:38:53 -0700 Subject: [PATCH 2/3] Export new quota related symbols. --- module/zcommon/zfs_prop.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c index b8d969bbac..b7294720cb 100644 --- a/module/zcommon/zfs_prop.c +++ b/module/zcommon/zfs_prop.c @@ -530,10 +530,11 @@ zfs_prop_align_right(zfs_prop_t prop) #if defined(_KERNEL) && defined(HAVE_SPL) /* zfs dataset property functions */ +EXPORT_SYMBOL(zfs_userquota_prop_prefixes); EXPORT_SYMBOL(zfs_prop_init); EXPORT_SYMBOL(zfs_prop_get_type); -EXPORT_SYMBOL(zfs_prop_delegatable); EXPORT_SYMBOL(zfs_prop_get_table); +EXPORT_SYMBOL(zfs_prop_delegatable); /* Dataset property functions shared between libzfs and kernel. */ EXPORT_SYMBOL(zfs_prop_default_string); @@ -544,6 +545,7 @@ EXPORT_SYMBOL(zfs_prop_setonce); EXPORT_SYMBOL(zfs_prop_to_name); EXPORT_SYMBOL(zfs_name_to_prop); EXPORT_SYMBOL(zfs_prop_user); +EXPORT_SYMBOL(zfs_prop_userquota); EXPORT_SYMBOL(zfs_prop_index_to_string); EXPORT_SYMBOL(zfs_prop_string_to_index); EXPORT_SYMBOL(zfs_prop_valid_for_type); From 8a5b47ebb5334646f1b3c1621788a9b991da21d7 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 10 Jul 2009 11:39:37 -0700 Subject: [PATCH 3/3] Add dmu_write_impl() prototype needed by zpios until a clean zerocopy interface is available. --- module/zfs/include/sys/dmu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/zfs/include/sys/dmu.h b/module/zfs/include/sys/dmu.h index d4dc194611..b48b4f416b 100644 --- a/module/zfs/include/sys/dmu.h +++ b/module/zfs/include/sys/dmu.h @@ -483,6 +483,8 @@ int dmu_free_object(objset_t *os, uint64_t object); #define DMU_WRITE_ZEROCOPY 4 /* zerocopy on write (test) */ int dmu_read(objset_t *os, uint64_t object, uint64_t offset, uint64_t size, void *buf, uint32_t flags); +void dmu_write_impl(objset_t *os, uint64_t object, uint64_t offset, + uint64_t size, const void *buf, dmu_tx_t *tx, int flags); void dmu_write(objset_t *os, uint64_t object, uint64_t offset, uint64_t size, const void *buf, dmu_tx_t *tx); void dmu_prealloc(objset_t *os, uint64_t object, uint64_t offset, uint64_t size,