Merge commit 'refs/top-bases/top' into topzfs-0.4.8

2 files changed, 86 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index bcc515c52..63c7947cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,88 @@
+2010-03-11 Brian Behlendorf <[email protected]>
+
+	* : Tag zfs-0.4.8 - Use 'git log --no-merges' for full change log.
+
+	* : Build system improvements:
+	- Remove Module.markers and Module.symver{s} in clean target.
+	- Improved kernel source detection when none specified.
+	- Fix RPM definitions for the unknown distro/installation.
+	- Check for spl in ../spl if not found in install path.
+	- Include all headers regardless of depth in packages.
+	- Allow recursive configure/make.
+
+	* lib/libzpool/kernel.c: Fixed several zdb bugs when opening a pool
+	- zdb wasn't getting the correct device size when the vdev is a
+	  block device.  In Solaris, fstat64() returns the device size but
+	  in Linux an ioctl() is needed.
+	- make sure that we don't try to open a block device in write mode
+	  from userspace.  This shouldn't happen, because zdb opens devices
+	  in read-only mode, and ztest only uses files.
+
+	* lib/libspl/include/umem.h: Add umem_alloc_aligned() and honor
+	cache_align field for umem cache.  Under linux we open block devices
+	with O_DIRECT which means we must provide aligned memory buffers.
+
+	* lib/libzpool/kernel.c: Fix some incorrect error handling.  In
+	vn_open(), if fstat64() returned an error, the real errno was being
+	obscured by calling close().
+
+	* scripts/*: Fix scripts to work when invoked from other directories.
+
+	* module/zfs/arc.c: Fix struct ht_lock padding in arc.c.
+
+	* lib/libefi/include/sys/uuid.h: Fix duplicate uuid_t typedef.
+
+	* module/zfs/txg.c: Use CPU percentages for number of commit cb
+	threads.  This doesn't change number of threads in the kernel, but it
+	reduces number of threads in ztest (important due to 32-bit address
+	limitations).
+
+	* cmd/ztest/ztest.c: Clean up emulation of kernel threads in
+	userspace.  Updated to use pthread thread specific data rather than
+	keeping a global list.  This also fixes at least one easily
+	reproducible crash in ztest
+
+	* META, config/kernel.m4: Add configure check for kernel build
+	options which are incompatible with the license.  If your building
+	against a kernel deemed incompatible configure will fail and
+	suggest how you should rebuild your kernel.
+
+	* config/kernel-fmode-t.m4: Linux 2.6.28 compat, add a check for the
+	fmode_t type.  This typedef first appears in 2.6.28 kernels as part
+	of some block device operation reworking.
+
+	* module/zfs/dmu_send.c: No inline to keep dmu_recv_stream() stack
+	frame less than 1024 bytes.  Recent builds against 2.6.31 flagged
+	dmu_recv_stream() as stack heavy.  Further analysis of this function
+	should be performed to further reduce its stack usage.
+
+	* scripts/common.sh: Split the udev rule from a specific configuration
+	by providing a generic 60-zpool.rules file which uses a small helper
+	util 'zpool_id' to parse a configuration file by default located in
+	/etc/zfs/zdev.conf.  The helper script maps a by-path udev name to a
+	more friendly name of <channel><rank> for large configurations.
+
+	Additionally, when running zpool-create.sh in-tree it will no longer
+	use udev because we would have to copy certain helper scripts in to
+	the installed system.  To avoid this the config file in simply
+	parsed and symlinks are created in your working tree.  The script
+	will use udev if it as run as part of an installed zfs-test package.
+
+	* module/zfs/zvol.c: Use check_disk_change() instead of
+	revalidate_disk().  For 2.6.27 kernels are earlier revalidate_disk()
+	was not available.  However, check_disk_change() has been available
+	for far longer and will properly inform the kernel of the volume
+	change for both older and newer kernels.
+
+	* module/zfs/dmu.c: Fixed incorrect ASSERT3S() added by ZVOL.
+
+	* module/zfs/vdev_raidz.c, module/zfs/zvol.c: Minor fixes for 32-bit.
+
+	* scripts/zfs-update.sh, man/man8/*: Added man pages based on the
+	latest documentation and modified zfs-update.sh script to update them.
+
+	* .gitignore: Updated .gitignore rules to exclude build products.
+
 2009-11-24 Brian Behlendorf <[email protected]>
 
 	* : Tag zfs-0.4.7 - Use 'git log --no-merges' for full change log.
diff --git a/META b/META
index 90ea64efa..43d256879 100644
--- a/META
+++ b/META
@@ -1,7 +1,7 @@
 Meta:         1
 Name:         zfs
 Branch:       1.0
-Version:      0.4.7
+Version:      0.4.8
 Release:      1
 Release-Tags: relext
 License:      CDDL