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 2008-12-22 16:09:44 -08:00
parent f66d942698 ebfc1d4742
commit 47434aa770
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/zinject/zinject.c
View File

@ -750,17 +750,20 @@ main(int argc, char **argv)
if (dataset[0] != '\0' && domount) { if (dataset[0] != '\0' && domount) {
if ((zhp = zfs_open(g_zfs, dataset, ZFS_TYPE_DATASET)) == NULL) if ((zhp = zfs_open(g_zfs, dataset, ZFS_TYPE_DATASET)) == NULL)
return (1); return (1);
#ifdef HAVE_ZPL
if (zfs_unmount(zhp, NULL, 0) != 0) if (zfs_unmount(zhp, NULL, 0) != 0)
return (1); return (1);
#endif /* HAVE_ZPL */
} }
record.zi_error = error; record.zi_error = error;
ret = register_handler(pool, flags, &record, quiet); ret = register_handler(pool, flags, &record, quiet);
#ifdef HAVE_ZPL
if (dataset[0] != '\0' && domount) if (dataset[0] != '\0' && domount)
ret = (zfs_mount(zhp, NULL, 0) != 0); ret = (zfs_mount(zhp, NULL, 0) != 0);
#endif /* HAVE_ZPL */
libzfs_fini(g_zfs); libzfs_fini(g_zfs);

3
cmd/ztest/Makefile.am
View File

@ -2,9 +2,12 @@ include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libzpool/include \
-I${top_srcdir}/lib/libuutil/include \ -I${top_srcdir}/lib/libuutil/include \
-I${top_srcdir}/lib/libzfs/include \ -I${top_srcdir}/lib/libzfs/include \
-I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/zfs \
-I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \ -I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include -I${top_srcdir}/module/avl/include