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

Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm

This commit is contained in:
Brian Behlendorf 2008-12-16 15:51:30 -08:00
parent 0c4636f3f2 12c13fbafb
commit 93a2ebff4a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libzfs/Makefile.am
View File

@ -6,6 +6,7 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/lib/libuutil/include \ -I${top_srcdir}/lib/libuutil/include \
-I${top_srcdir}/module/zfs \
-I${top_srcdir}/module/zfs/include \ -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 \

2
lib/libzfs/libzfs_sendrecv.c
View File

@ -1852,13 +1852,13 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
*/ */
avl_tree_t *local_avl; avl_tree_t *local_avl;
nvlist_t *local_nv, *fs; nvlist_t *local_nv, *fs;
char *cp = strchr(zc.zc_value, '@');
/* /*
* XXX Do this faster by just iterating over snaps in * XXX Do this faster by just iterating over snaps in
* this fs. Also if zc_value does not exist, we will * this fs. Also if zc_value does not exist, we will
* get a strange "does not exist" error message. * get a strange "does not exist" error message.
*/ */
cp = strchr(zc.zc_value, '@');
*cp = '\0'; *cp = '\0';
if (gather_nvlist(hdl, zc.zc_value, NULL, NULL, if (gather_nvlist(hdl, zc.zc_value, NULL, NULL,
&local_nv, &local_avl) == 0) { &local_nv, &local_avl) == 0) {