Date: Fri, 17 Oct 2014 13:46:16 +0000 (UTC) From: Steven Hartland <smh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r273217 - releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <201410171346.s9HDkGQq057365@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: smh Date: Fri Oct 17 13:46:16 2014 New Revision: 273217 URL: https://svnweb.freebsd.org/changeset/base/273217 Log: MFS10 r273057 MFC r272324 Fix a missed merge introduced in r272883 Approved by: re@ (gjb) Sponsored by: Multiplay Modified: releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Directory Properties: releng/10.1/ (props changed) Modified: releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c ============================================================================== --- releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Fri Oct 17 13:40:17 2014 (r273216) +++ releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Fri Oct 17 13:46:16 2014 (r273217) @@ -3662,7 +3662,6 @@ zfs_ioc_destroy_bookmarks(const char *po 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410171346.s9HDkGQq057365>