diff options
| author | avg <avg@FreeBSD.org> | 2016-05-18 08:23:39 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2016-05-18 08:23:39 +0000 |
| commit | 196a4ff1d22a027eadd5e8497a1f08a627a0b422 (patch) | |
| tree | 5679a515109c14d1d21fd7d10fb5abea8e388519 /sys | |
| parent | 7553ece82a1e0103713acf6d7cd8bd39427c59e4 (diff) | |
| download | FreeBSD-src-196a4ff1d22a027eadd5e8497a1f08a627a0b422.zip FreeBSD-src-196a4ff1d22a027eadd5e8497a1f08a627a0b422.tar.gz | |
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
Diffstat (limited to 'sys')
| -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 31048d9..dfe9154 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); |
