diff options
| author | avg <avg@FreeBSD.org> | 2016-07-13 09:05:14 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2016-07-13 09:05:14 +0000 |
| commit | 3fdba9906c8102d35fc881cfe38646608a6bb3aa (patch) | |
| tree | f87dec799e5fab4f5d1849ef03b1c3e96f4373d0 /sys/cddl | |
| parent | ed0c38b77c1394455f04c43991e8e90d848a6923 (diff) | |
| download | FreeBSD-src-3fdba9906c8102d35fc881cfe38646608a6bb3aa.zip FreeBSD-src-3fdba9906c8102d35fc881cfe38646608a6bb3aa.tar.gz | |
MFC r300132: zfsctl: tighten assertion and remove unused definition
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h | 1 | ||||
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h index 1945686..8849003 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h @@ -61,7 +61,6 @@ int zfsctl_lookup_objset(vfs_t *vfsp, uint64_t objsetid, zfsvfs_t **zfsvfsp); #define ZFSCTL_INO_ROOT 0x1 #define ZFSCTL_INO_SNAPDIR 0x2 -#define ZFSCTL_INO_SHARES 0x3 #ifdef __cplusplus } diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c index 693ba41..c8a522f 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c @@ -223,7 +223,7 @@ zfsctl_root_inode_cb(vnode_t *vp, int index) { zfsvfs_t *zfsvfs = vp->v_vfsp->vfs_data; - ASSERT(index <= 2); + ASSERT(index < 2); if (index == 0) return (ZFSCTL_INO_SNAPDIR); |
