From: Dan McDonald <danmcd@omniti.com>
Date: Wed, 3 Feb 2016 00:34:23 +0000 (-0800)
Subject: Illumos 6096 - ZFS_SMB_ACL_RENAME needs to cleanup better
X-Git-Tag: zfs-0.7.0-rc1~260
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4d179efa98f7fd3a54d2cf056b1ab3d86f14d50;p=zfs

Illumos 6096 - ZFS_SMB_ACL_RENAME needs to cleanup better

6096 ZFS_SMB_ACL_RENAME needs to cleanup better
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Reviewed by: George Wilson <gwilson@zfsmail.com>
Approved by: Robert Mustacchi <rm@joyent.com>

References:
  https://www.illumos.org/issues/6096
  https://github.com/illumos/illumos-gate/commit/8f5190a5

Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
---

diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 003079902..746a3f0fc 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -4847,6 +4847,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(zsb);
 			return (error);
 		}