summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@joyent.com>2013-11-21 12:21:31 +0000
committerRobert Mustacchi <rm@joyent.com>2013-11-21 13:38:54 +0000
commitc08561f1d0553595a6822a4d20ce2fbefbda57d5 (patch)
treeaed74468f381fde5f43c53c1b971adb0c3be8b1c
parent46ffc2613981f0914773fccaf5f08e63b6926a00 (diff)
downloadillumos-joyent-c08561f1d0553595a6822a4d20ce2fbefbda57d5.tar.gz
OS-2636 port_fop_femuninstall is too loose with its locks
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
-rw-r--r--usr/src/uts/common/fs/portfs/port_fop.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr/src/uts/common/fs/portfs/port_fop.c b/usr/src/uts/common/fs/portfs/port_fop.c
index 03a03dd2a6..1816956d10 100644
--- a/usr/src/uts/common/fs/portfs/port_fop.c
+++ b/usr/src/uts/common/fs/portfs/port_fop.c
@@ -579,7 +579,6 @@ port_fop_femuninstall(vnode_t *vp)
*/
(void) fem_uninstall(vp, (fem_t *)pvp->pvp_femp, vp);
pvp->pvp_femp = NULL;
- mutex_exit(&pvp->pvp_mutex);
/*
@@ -602,9 +601,8 @@ port_fop_femuninstall(vnode_t *vp)
} else {
mutex_exit(mtx);
}
- } else {
- mutex_exit(&pvp->pvp_mutex);
}
+ mutex_exit(&pvp->pvp_mutex);
return (ret);
}