diff options
| author | mav <mav@FreeBSD.org> | 2016-03-21 00:09:56 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2016-03-21 00:09:56 +0000 |
| commit | 9a698f756ea29639b283ef5bedead6089ab3fbb4 (patch) | |
| tree | 0382f2f93dd38875c070857b827e0d722f9e3c64 | |
| parent | 745a33b96e030e84eecf01c4ddbbd869f3c9d48e (diff) | |
| download | FreeBSD-src-9a698f756ea29639b283ef5bedead6089ab3fbb4.zip FreeBSD-src-9a698f756ea29639b283ef5bedead6089ab3fbb4.tar.gz | |
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.
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c index fd6f966..fd1d59b 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c @@ -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); |
