diff options
| author | jeff <jeff@FreeBSD.org> | 2002-04-09 05:14:17 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2002-04-09 05:14:17 +0000 |
| commit | 0b5e15cef7e330c83d47d2a7a5a4e738694c1324 (patch) | |
| tree | bb0a617bffb016969e8ff3d8fdc28fa058d41c57 /sys/kern/vfs_vnops.c | |
| parent | f145b3f0f45ceb2c9e4fa29f25e223320156b800 (diff) | |
| download | FreeBSD-src-0b5e15cef7e330c83d47d2a7a5a4e738694c1324.zip FreeBSD-src-0b5e15cef7e330c83d47d2a7a5a4e738694c1324.tar.gz | |
Turn #ifdef LOOKUP_SHARED into #ifndef LOOKUP_EXCLUSIVE to enable this
behavior by default. Also, change the options line to reflect this.
If there are no problems reported this will become the only behavior and the
knob will be removed in a month or so.
Demanded by: obrien
Diffstat (limited to 'sys/kern/vfs_vnops.c')
| -rw-r--r-- | sys/kern/vfs_vnops.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 9eb60f9..3187a47 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -106,7 +106,7 @@ vn_open_cred(ndp, flagp, cmode, cred) struct vattr vat; struct vattr *vap = &vat; int mode, fmode, error; -#ifdef LOOKUP_SHARED +#ifndef LOOKUP_EXCLUSIVE int exclusive; /* The current intended lock state */ exclusive = 0; @@ -149,7 +149,7 @@ restart: ASSERT_VOP_LOCKED(ndp->ni_vp, "create"); fmode &= ~O_TRUNC; vp = ndp->ni_vp; -#ifdef LOOKUP_SHARED +#ifndef LOOKUP_EXCLUSIVE exclusive = 1; #endif } else { @@ -167,7 +167,7 @@ restart: } } else { ndp->ni_cnd.cn_nameiop = LOOKUP; -#ifdef LOOKUP_SHARED +#ifndef LOOKUP_EXCLUSIVE ndp->ni_cnd.cn_flags = ((fmode & O_NOFOLLOW) ? NOFOLLOW : FOLLOW) | LOCKSHARED | LOCKLEAF; @@ -213,7 +213,7 @@ restart: * Make sure that a VM object is created for VMIO support. */ if (vn_canvmio(vp) == TRUE) { -#ifdef LOOKUP_SHARED +#ifndef LOOKUP_EXCLUSIVE int flock; if (!exclusive && vp->v_object == NULL) @@ -236,7 +236,7 @@ restart: *flagp = fmode; return (error); } -#ifdef LOOKUP_SHARED +#ifndef LOOKUP_EXCLUSIVE flock = VOP_ISLOCKED(vp, td); if (!exclusive && flock == LK_EXCLUSIVE) VOP_LOCK(vp, LK_DOWNGRADE, td); |
