diff options
| author | delphij <delphij@FreeBSD.org> | 2014-10-13 18:46:30 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-10-13 18:46:30 +0000 |
| commit | 02d8987f8ddd0618a75029e5a4d8e2167dab4951 (patch) | |
| tree | 0f2ec602295322ef5442b595bed7870b6347da26 | |
| parent | 9a0f5691818469e9b93a4c7a658bf2849ee9979f (diff) | |
| download | FreeBSD-src-02d8987f8ddd0618a75029e5a4d8e2167dab4951.zip FreeBSD-src-02d8987f8ddd0618a75029e5a4d8e2167dab4951.tar.gz | |
Fix a missed merge introduced in r272883.
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c index 8c2e9b9..8c2d11c 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c @@ -3662,7 +3662,6 @@ zfs_ioc_destroy_bookmarks(const char *poolname, nvlist_t *innvl, if (strncmp(name, poolname, poollen) != 0 || (name[poollen] != '/' && name[poollen] != '#')) return (SET_ERROR(EXDEV)); - (void) zvol_remove_minor(name); } error = dsl_bookmark_destroy(innvl, outnvl); |
