From 2f40ac4d9e154f1d1ca4073ef8c3bfba92093c86 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 8 Dec 2008 16:38:46 -0800 Subject: [PATCH 1/2] Minor tweak to update script --- scripts/update-zfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-zfs.sh b/scripts/update-zfs.sh index f833a4cbe8..057dcc40b7 100755 --- a/scripts/update-zfs.sh +++ b/scripts/update-zfs.sh @@ -86,7 +86,6 @@ cp ${SRC_LIB}/libuutil/common/*.h ${DST_LIB}/libuutil/include/ echo "* zfs/lib/libspl" mkdir -p ${DST_LIB}/libspl/include/sys/ -cp ${SRC_LIB}/libzpool/common/kernel.c ${DST_LIB}/libspl/ cp ${SRC_LIB}/libzpool/common/taskq.c ${DST_LIB}/libspl/ cp ${SRC_LIB}/libzpool/common/util.c ${DST_LIB}/libspl/ cp ${SRC_LIB}/libzpool/common/sys/zfs_context.h ${DST_LIB}/libspl/include/sys/ @@ -110,6 +109,7 @@ cp ${SRC_UCM}/sys/fm/fs/zfs.h ${DST_LIB}/libzcommon/include/sys/fm/fs/ echo "* zfs/lib/libzpool" mkdir -p ${DST_LIB}/libzpool/include/sys/ +cp ${SRC_LIB}/libzpool/common/kernel.c ${DST_LIB}/libzpool/ cp ${SRC_ZLIB}/*.c ${DST_LIB}/libzpool/ cp ${SRC_UTS}/intel/zfs/spa_boot.c ${DST_LIB}/libzpool/ cp ${SRC_ZLIB}/sys/*.h ${DST_LIB}/libzpool/include/sys/ From eb4c9bf0397e518c96309b76819442a37c137c8a Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 8 Dec 2008 16:41:14 -0800 Subject: [PATCH 2/2] Update makefiles, kernel.c moved to libzpool --- zfs/lib/libspl/Makefile.in | 3 +-- zfs/lib/libzpool/Makefile.in | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/zfs/lib/libspl/Makefile.in b/zfs/lib/libspl/Makefile.in index cc197a7c0a..eed27e6b58 100644 --- a/zfs/lib/libspl/Makefile.in +++ b/zfs/lib/libspl/Makefile.in @@ -1,5 +1,5 @@ subdir-m += include -DISTFILES = kernel.c mkdirp.c strlcpy.c taskq.c util.c +DISTFILES = mkdirp.c strlcpy.c taskq.c util.c DISTFILES += list.c strlcat.c strnlen.c u8_textprep.c LIBRARY := libzport @@ -17,7 +17,6 @@ always := $(hostprogs-y) zu-objs := zu.o ${LIBRARY}.so -${LIBRARY}-objs += kernel.o ${LIBRARY}-objs += mkdirp.o ${LIBRARY}-objs += strlcpy.o ${LIBRARY}-objs += taskq.o diff --git a/zfs/lib/libzpool/Makefile.in b/zfs/lib/libzpool/Makefile.in index 0620621693..ade2b8d4af 100644 --- a/zfs/lib/libzpool/Makefile.in +++ b/zfs/lib/libzpool/Makefile.in @@ -93,5 +93,5 @@ ${MODULE}-objs += zfs_znode.o # Vnode to znode mapping # Traversal ${MODULE}-objs += dmu_traverse.o# Traversal code -# SPL (Solaris Porting Layer) -${MODULE}-objs += spl.o # Linux kernel glue and misc support +# Kernel or User Space Integration +${MODULE}-objs += kernel.o # Linux kernel/user glue and misc support