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

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

This commit is contained in:
Brian Behlendorf 2009-11-15 16:27:02 -08:00
parent 9ee04032de 844280cb2c
commit d00a0ea8a0
2 changed files with 1 additions and 1835 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1835
module/zfs/zvol.c
View File

File diff suppressed because it is too large Load Diff

1
scripts/zfs-update.sh
View File

@ -89,6 +89,7 @@ cp ${SRC_UTS}/intel/zfs/spa_boot.c ${DST_MOD}/zfs/
cp ${SRC_ZLIB}/*.c ${DST_MOD}/zfs/ cp ${SRC_ZLIB}/*.c ${DST_MOD}/zfs/
cp ${SRC_ZLIB}/sys/*.h ${DST_MOD}/zfs/include/sys/ cp ${SRC_ZLIB}/sys/*.h ${DST_MOD}/zfs/include/sys/
rm ${DST_MOD}/zfs/vdev_disk.c rm ${DST_MOD}/zfs/vdev_disk.c
rm ${DST_MOD}/zfs/zvol.c
rm ${DST_MOD}/zfs/include/sys/vdev_disk.h rm ${DST_MOD}/zfs/include/sys/vdev_disk.h
echo "* lib/libavl" echo "* lib/libavl"