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

lib/libzfs/Makefile.am

@@ -6,6 +6,7 @@ DEFAULT_INCLUDES += \
 	-I${top_srcdir}/lib/libspl/include \
         -I${top_srcdir}/lib/libnvpair/include \
 	-I${top_srcdir}/lib/libuutil/include \
+	-I${top_srcdir}/module/zfs \
 	-I${top_srcdir}/module/zfs/include \
         -I${top_srcdir}/module/zcommon/include \
         -I${top_srcdir}/module/nvpair/include \

lib/libzfs/libzfs_sendrecv.c

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