svn commit: r272332 - in stable/10/sys/cddl: boot/zfs contrib/opensolaris/uts/common/fs/zfs/sys

[Xin LI]

Author: delphij
Date: Tue Sep 30 21:03:17 2014
New Revision: 272332
URL: http://svnweb.freebsd.org/changeset/base/272332

Log:
  MFC r271526: MFV r271510:
  
  Enforce 4K as smallest indirect block size (previously the smallest
  indirect block size was 1K but that was never used).
  
  This makes some space estimates more accurate and uses less memory
  for some data structures.
  
  Illumos issue:
      5141 zfs minimum indirect block size is 4K
  
  Approved by:	re (gjb)

Modified:
  stable/10/sys/cddl/boot/zfs/zfsimpl.h
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/boot/zfs/zfsimpl.h
==============================================================================
--- stable/10/sys/cddl/boot/zfs/zfsimpl.h	Tue Sep 30 20:57:25 2014	(r272331)
+++ stable/10/sys/cddl/boot/zfs/zfsimpl.h	Tue Sep 30 21:03:17 2014	(r272332)
@@ -840,7 +840,7 @@ struct uberblock {
  * Fixed constants.
  */
 #define	DNODE_SHIFT		9	/* 512 bytes */
-#define	DN_MIN_INDBLKSHIFT	10	/* 1k */
+#define	DN_MIN_INDBLKSHIFT	12	/* 4k */
 #define	DN_MAX_INDBLKSHIFT	14	/* 16k */
 #define	DNODE_BLOCK_SHIFT	14	/* 16k */
 #define	DNODE_CORE_SIZE		64	/* 64 bytes for dnode sans blkptrs */

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h	Tue Sep 30 20:57:25 2014	(r272331)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h	Tue Sep 30 21:03:17 2014	(r272332)
@@ -56,7 +56,7 @@ extern "C" {
  * Fixed constants.
  */
 #define	DNODE_SHIFT		9	/* 512 bytes */
-#define	DN_MIN_INDBLKSHIFT	10	/* 1k */
+#define	DN_MIN_INDBLKSHIFT	12	/* 4k */
 #define	DN_MAX_INDBLKSHIFT	14	/* 16k */
 #define	DNODE_BLOCK_SHIFT	14	/* 16k */
 #define	DNODE_CORE_SIZE		64	/* 64 bytes for dnode sans blkptrs */