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

[Alexander Motin]

Author: mav
Date: Mon Mar 21 00:09:56 2016
New Revision: 297107
URL: https://svnweb.freebsd.org/changeset/base/297107

Log:
  MFC r296021 (by smh): Removed unused label and fix mutex_exit order
  
  Remove unused done label from zfs_setacl fixing PVS-Studio V729.
  
  Fix mutex_exit order to mirror the mutex_enter order.

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

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c	Mon Mar 21 00:07:56 2016	(r297106)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c	Mon Mar 21 00:09:56 2016	(r297107)
@@ -1994,8 +1994,8 @@ top:
 	zfs_sa_upgrade_txholds(tx, zp);
 	error = dmu_tx_assign(tx, TXG_NOWAIT);
 	if (error) {
-		mutex_exit(&zp->z_acl_lock);
 		mutex_exit(&zp->z_lock);
+		mutex_exit(&zp->z_acl_lock);
 
 		if (error == ERESTART) {
 			dmu_tx_wait(tx);
@@ -2020,7 +2020,6 @@ top:
 	if (fuidp)
 		zfs_fuid_info_free(fuidp);
 	dmu_tx_commit(tx);
-done:
 	mutex_exit(&zp->z_lock);
 	mutex_exit(&zp->z_acl_lock);