diff options
| author | jeff <jeff@FreeBSD.org> | 2005-03-24 06:04:35 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2005-03-24 06:04:35 +0000 |
| commit | c6119ea3e7de11dd5cac183431854137e44b2066 (patch) | |
| tree | 6ea45335d5d97007be3af726a7282857460139c5 | |
| parent | b84afc39aafb16dc62e5ac1bdacf3b7a418c90c9 (diff) | |
| download | FreeBSD-src-c6119ea3e7de11dd5cac183431854137e44b2066.zip FreeBSD-src-c6119ea3e7de11dd5cac183431854137e44b2066.tar.gz | |
- Remove some long dead LOOKUP_SHARED code that tracked the lock state.
- Always pass LOCKSHARED and rely on namei() to ignore it when
LOOKUP_SHARED is not set.
Sponsored by: Isilon Systems, Inc.
| -rw-r--r-- | sys/kern/vfs_vnops.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 755b1c0..0723a63 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -112,11 +112,6 @@ vn_open_cred(ndp, flagp, cmode, cred, fdidx) struct vattr *vap = &vat; int mode, fmode, error; int vfslocked; -#ifdef LOOKUP_SHARED - int exclusive; /* The current intended lock state */ - - exclusive = 0; -#endif restart: vfslocked = 0; @@ -168,9 +163,6 @@ restart: ASSERT_VOP_LOCKED(ndp->ni_vp, "create"); fmode &= ~O_TRUNC; vp = ndp->ni_vp; -#ifdef LOOKUP_SHARED - exclusive = 1; -#endif } else { if (ndp->ni_dvp == ndp->ni_vp) vrele(ndp->ni_dvp); @@ -186,15 +178,9 @@ restart: } } else { ndp->ni_cnd.cn_nameiop = LOOKUP; -#ifdef LOOKUP_SHARED ndp->ni_cnd.cn_flags = ((fmode & O_NOFOLLOW) ? NOFOLLOW : FOLLOW) | LOCKSHARED | LOCKLEAF | MPSAFE; -#else - ndp->ni_cnd.cn_flags = - ((fmode & O_NOFOLLOW) ? NOFOLLOW : FOLLOW) | - LOCKLEAF | MPSAFE; -#endif if ((error = namei(ndp)) != 0) return (error); ndp->ni_cnd.cn_flags &= ~MPSAFE; |
