diff options
author | jeff <jeff@FreeBSD.org> | 2005-03-13 12:18:25 +0000 |
---|---|---|
committer | jeff <jeff@FreeBSD.org> | 2005-03-13 12:18:25 +0000 |
commit | 0d9df2e12d6a83b8934322f557844cc0bb7bd488 (patch) | |
tree | aa27ba510f7c723270e0278e561283b717a36c7b /sys/fs/smbfs/smbfs_vnops.c | |
parent | 5d7c91ddde246cd0d3f506a01bb53ba5fb41dd5d (diff) | |
download | FreeBSD-src-0d9df2e12d6a83b8934322f557844cc0bb7bd488.zip FreeBSD-src-0d9df2e12d6a83b8934322f557844cc0bb7bd488.tar.gz |
- The VI_DOOMED flag now signals the end of a vnode's relationship with
the filesystem. Check that rather than VI_XLOCK.
- VOP_INACTIVE should no longer drop the vnode lock.
- The vnode lock is required around calls to vrecycle() and vgone().
Sponsored by: Isilon Systems, Inc.
Diffstat (limited to 'sys/fs/smbfs/smbfs_vnops.c')
-rw-r--r-- | sys/fs/smbfs/smbfs_vnops.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index 6125b89..9b27a52 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -220,10 +220,6 @@ smbfs_open(ap) return error; } -/* - * XXX: VOP_CLOSE() usually called without lock held which is suck. Here we - * do some heruistic to determine if vnode should be locked. - */ static int smbfs_close(ap) struct vop_close_args /* { @@ -238,22 +234,13 @@ smbfs_close(ap) struct thread *td = ap->a_td; struct smbnode *np = VTOSMB(vp); struct smb_cred scred; - int dolock; - VI_LOCK(vp); - dolock = (vp->v_iflag & VI_XLOCK) == 0; - if (dolock) - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY | LK_INTERLOCK, td); - else - VI_UNLOCK(vp); if (vp->v_type == VDIR && (np->n_flag & NOPEN) != 0 && np->n_dirseq != NULL) { smb_makescred(&scred, td, ap->a_cred); smbfs_findclose(np->n_dirseq, &scred); np->n_dirseq = NULL; } - if (dolock) - VOP_UNLOCK(vp, 0, td); return 0; } @@ -1187,9 +1174,9 @@ smbfs_lookup(ap) return (0); } cache_purge(vp); - vput(vp); if (killit) vgone(vp); + vput(vp); if (lockparent && dvp != vp && islastcn) VOP_UNLOCK(dvp, 0, td); } |