svn commit: r288574 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Sat Oct  3 08:07:21 2015
New Revision: 288574
URL: https://svnweb.freebsd.org/changeset/base/288574

Log:
  MFC r286712: 6096 ZFS_SMB_ACL_RENAME needs to cleanup better
  
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Gordon Ross <gordon.w.ross at gmail.com>
  Reviewed by: George Wilson <gwilson at zfsmail.com>
  Approved by: Robert Mustacchi <rm at joyent.com>
  
  illumos/illumos-gate at 8f5190a540d64d2debee6664bbc740e4c38f5b7f

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sat Oct  3 08:06:29 2015	(r288573)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sat Oct  3 08:07:21 2015	(r288574)
@@ -5189,6 +5189,7 @@ zfs_ioc_smb_acl(zfs_cmd_t *zc)
 		if ((error = get_nvlist(zc->zc_nvlist_src,
 		    zc->zc_nvlist_src_size, zc->zc_iflags, &nvlist)) != 0) {
 			VN_RELE(vp);
+			VN_RELE(ZTOV(sharedir));
 			ZFS_EXIT(zfsvfs);
 			return (error);
 		}