svn commit: r300132 - in head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys

[Andriy Gapon]

Author: avg
Date: Wed May 18 08:23:39 2016
New Revision: 300132
URL: https://svnweb.freebsd.org/changeset/base/300132

Log:
  zfsctl: tighten an assertion and remove an unused definition
  
  There are only two entries under .zfs and 'shares' has an ID of a
  special persistent object in its filesystem.
  
  MFC after:	1 week

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h	Wed May 18 08:19:41 2016	(r300131)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h	Wed May 18 08:23:39 2016	(r300132)
@@ -61,7 +61,6 @@ int zfsctl_lookup_objset(vfs_t *vfsp, ui
 
 #define	ZFSCTL_INO_ROOT		0x1
 #define	ZFSCTL_INO_SNAPDIR	0x2
-#define	ZFSCTL_INO_SHARES	0x3
 
 #ifdef	__cplusplus
 }

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	Wed May 18 08:19:41 2016	(r300131)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	Wed May 18 08:23:39 2016	(r300132)
@@ -223,7 +223,7 @@ zfsctl_root_inode_cb(vnode_t *vp, int in
 {
 	zfsvfs_t *zfsvfs = vp->v_vfsp->vfs_data;
 
-	ASSERT(index <= 2);
+	ASSERT(index < 2);
 
 	if (index == 0)
 		return (ZFSCTL_INO_SNAPDIR);