From 124bf5e823dfe2ddde94c57660a3beffc2f99b57 Mon Sep 17 00:00:00 2001 From: phk Date: Tue, 15 Mar 2005 08:07:07 +0000 Subject: Simplify the vfs_hash calling convention. --- sys/ufs/ffs/ffs_vfsops.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'sys/ufs') diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index c551efb..950f14e 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1164,7 +1164,6 @@ ffs_vget(mp, ino, flags, vpp) int flags; struct vnode **vpp; { - struct thread *td = curthread; /* XXX */ struct fs *fs; struct inode *ip; struct ufsmount *ump; @@ -1174,10 +1173,8 @@ ffs_vget(mp, ino, flags, vpp) int error; error = vfs_hash_get(mp, ino, flags, curthread, vpp); - if (error) + if (error || *vpp != NULL) return (error); - if (*vpp != NULL) - return (0); /* * We do not lock vnode creation as it is believed to be too @@ -1227,30 +1224,13 @@ ffs_vget(mp, ino, flags, vpp) ip->i_dquot[i] = NODQUOT; } #endif - /* - * Exclusively lock the vnode before adding to hash. Note, that we - * must not release nor downgrade the lock (despite flags argument - * says) till it is fully initialized. - */ - lockmgr(vp->v_vnlock, LK_EXCLUSIVE, (struct mtx *)0, td); - /* - * Atomicaly (in terms of vfs_hash operations) check the hash for - * duplicate of vnode being created and add it to the hash. If a - * duplicate vnode was found, it will be vget()ed from hash for us. - */ - if ((error = vfs_hash_insert(vp, ino, flags, curthread, vpp)) != 0) { + error = vfs_hash_insert(vp, ino, flags, curthread, vpp); + if (error || *vpp != NULL) { vput(vp); - *vpp = NULL; return (error); } - /* We lost the race, then throw away our vnode and return existing */ - if (*vpp != NULL) { - vput(vp); - return (0); - } - /* Read in the disk contents for the inode, copy into the inode. */ error = bread(ump->um_devvp, fsbtodb(fs, ino_to_fsba(fs, ino)), (int)fs->fs_bsize, NOCRED, &bp); -- cgit v1.1