svn commit: r185556 - head/sys/ufs/ufs
Konstantin Belousov
kib at FreeBSD.org
Tue Dec 2 03:12:51 PST 2008
Author: kib
Date: Tue Dec 2 11:12:50 2008
New Revision: 185556
URL: http://svn.freebsd.org/changeset/base/185556
Log:
Do not lock vnode interlock around reading of v_iflag to check VI_DOOMED.
Read of the pointer is atomic, and flag cannot be set while vnode lock
is held.
Requested by: jhb
MFC after: 1 month
Modified:
head/sys/ufs/ufs/ufs_lookup.c
Modified: head/sys/ufs/ufs/ufs_lookup.c
==============================================================================
--- head/sys/ufs/ufs/ufs_lookup.c Tue Dec 2 10:46:35 2008 (r185555)
+++ head/sys/ufs/ufs/ufs_lookup.c Tue Dec 2 11:12:50 2008 (r185556)
@@ -157,7 +157,6 @@ ufs_lookup(ap)
int nameiop = cnp->cn_nameiop;
ino_t ino;
int ltype;
- int pdoomed;
struct mount *mp;
bp = NULL;
@@ -588,20 +587,14 @@ found:
VOP_UNLOCK(pdp, 0);
pause("ufs_dd", 1);
vn_lock(pdp, ltype | LK_RETRY);
- VI_LOCK(pdp);
- pdoomed = pdp->v_iflag & VI_DOOMED;
- VI_UNLOCK(pdp);
- if (pdoomed)
+ if (pdp->v_iflag & VI_DOOMED)
return (ENOENT);
}
VOP_UNLOCK(pdp, 0); /* race to get the inode */
error = VFS_VGET(mp, ino, cnp->cn_lkflags, &tdp);
vfs_unbusy(mp);
vn_lock(pdp, ltype | LK_RETRY);
- VI_LOCK(pdp);
- pdoomed = pdp->v_iflag & VI_DOOMED;
- VI_UNLOCK(pdp);
- if (pdoomed) {
+ if (pdp->v_iflag & VI_DOOMED) {
if (error == 0)
vput(tdp);
error = ENOENT;
More information about the svn-src-all
mailing list