Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-07-10 11:54:13 -07:00
parent 1459da27f2 0c76ef8865
commit 57161b731e
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zcommon/zfs_prop.c
View File

@ -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);

2
module/zfs/include/sys/dmu.h
View File

@ -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,

2
scripts/zfs.sh
View File

@ -14,7 +14,7 @@ KERNEL_MODULES=( \
)
SPL_MODULES=( \
${SPLBUILD}/module/spl/spl.ko \
${SPLBUILD}/spl/spl.ko \
)
ZFS_MODULES=( \