Author: jhb
Date: Tue Nov 4 22:30:24 2008
New Revision: 184660
URL: http://svn.freebsd.org/changeset/base/184660
Log:
Don't lock the vnode around calls to vn_fullpath().
Reviewed by: csjp, rwatson
Modified:
head/sys/security/audit/audit_bsm_klib.c
Modified: head/sys/security/audit/audit_bsm_klib.c
==============================================================================
--- head/sys/security/audit/audit_bsm_klib.c Tue Nov 4 20:57:39 2008
(r184659)
+++ head/sys/security/audit/audit_bsm_klib.c Tue Nov 4 22:30:24 2008
(r184660)
@@ -492,7 +492,7 @@ audit_canon_path(struct thread *td, char
char *rbuf, *fbuf, *copy;
struct filedesc *fdp;
struct sbuf sbf;
- int error, cwir, locked;
+ int error, cwir;
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "%s: at %s:%d",
__func__, __FILE__, __LINE__);
@@ -539,17 +539,8 @@ audit_canon_path(struct thread *td, char
* in the future.
*/
if (rvnp != NULL) {
- /*
- * Although unlikely, it is possible for filesystems to define
- * their own VOP_LOCK, so strictly speaking, we need to
- * conditionally pickup Giant around calls to vn_lock(9)
- */
- locked = VFS_LOCK_GIANT(rvnp->v_mount);
- vn_lock(rvnp, LK_EXCLUSIVE | LK_RETRY);
- vdrop(rvnp);
error = vn_fullpath_global(td, rvnp, &rbuf, &fbuf);
- VOP_UNLOCK(rvnp, 0);
- VFS_UNLOCK_GIANT(locked);
+ vdrop(rvnp);
if (error) {
cpath[0] = '\0';
if (cvnp != NULL)
@@ -560,12 +551,8 @@ audit_canon_path(struct thread *td, char
free(fbuf, M_TEMP);
}
if (cvnp != NULL) {
- locked = VFS_LOCK_GIANT(cvnp->v_mount);
- vn_lock(cvnp, LK_EXCLUSIVE | LK_RETRY);
- vdrop(cvnp);
error = vn_fullpath(td, cvnp, &rbuf, &fbuf);
- VOP_UNLOCK(cvnp, 0);
- VFS_UNLOCK_GIANT(locked);
+ vdrop(cvnp);
if (error) {
cpath[0] = '\0';
return;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
