aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1998-05-16 16:03:10 +0000
committerBruce Evans <bde@FreeBSD.org>1998-05-16 16:03:10 +0000
commit7db33283370348f8a4f818b7f5dcf1d0308ae0a7 (patch)
treefc856288b6c0cadfbbe77ea5811d01f74f396fc7 /sys
parentba692924a8c2e7a27a14e43dc3fe0149f0e99349 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/nfs/nfs_vnops.c4
-rw-r--r--sys/nfsclient/nfs_vnops.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 31c670ad8cd7..c4030790625f 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.85 1998/05/13 05:47:09 peter Exp $
+ * $Id: nfs_vnops.c,v 1.86 1998/05/16 15:21:29 bde Exp $
*/
@@ -880,7 +880,7 @@ nfs_lookup(ap)
VOP_UNLOCK(dvp, 0, p);
error = nfs_nget(dvp->v_mount, fhp, fhsize, &np);
if (error) {
- vn_lock(dvp, LK_EXCLUSIVE + LK_RETRY, p);
+ vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, p);
return (error);
}
newvp = NFSTOV(np);
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 31c670ad8cd7..c4030790625f 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.85 1998/05/13 05:47:09 peter Exp $
+ * $Id: nfs_vnops.c,v 1.86 1998/05/16 15:21:29 bde Exp $
*/
@@ -880,7 +880,7 @@ nfs_lookup(ap)
VOP_UNLOCK(dvp, 0, p);
error = nfs_nget(dvp->v_mount, fhp, fhsize, &np);
if (error) {
- vn_lock(dvp, LK_EXCLUSIVE + LK_RETRY, p);
+ vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, p);
return (error);
}
newvp = NFSTOV(np);