Author: avg
Date: Wed Jul 13 09:05:27 2016
New Revision: 302718
URL: https://svnweb.freebsd.org/changeset/base/302718
Log:
MFC r300132: zfsctl: tighten assertion and remove unused definition
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h
Wed Jul 13 09:05:14 2016 (r302717)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h
Wed Jul 13 09:05:27 2016 (r302718)
@@ -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: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
Wed Jul 13 09:05:14 2016 (r302717)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
Wed Jul 13 09:05:27 2016 (r302718)
@@ -222,7 +222,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);
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
