summaryrefslogtreecommitdiff
path: root/sys/kern/vfs_syscalls.c
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2013-06-05 01:26:01 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2013-06-05 01:26:01 +0000
commit9fd1f32608c5b921fe7865c4be916bede8e50ea9 (patch)
treeffd7d01efae7095b3689448cd8a644e66bcc76df /sys/kern/vfs_syscalls.c
parent421f8752339dc52d749942431b73a5269bd72f20 (diff)
Move FHASLOCK from f_flag to f_iflags, freeing up a bit for passing
O_* flags and eliminating an XXX comment. ok matthew@ deraadt@
Diffstat (limited to 'sys/kern/vfs_syscalls.c')
-rw-r--r--sys/kern/vfs_syscalls.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 3f1991ec207..880c32b6185 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_syscalls.c,v 1.192 2013/04/15 15:32:19 jsing Exp $ */
+/* $OpenBSD: vfs_syscalls.c,v 1.193 2013/06/05 01:26:00 guenther Exp $ */
/* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */
/*
@@ -1107,7 +1107,7 @@ doopenat(struct proc *p, int fd, const char *path, int oflags, mode_t mode,
goto out;
}
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
- fp->f_flag |= FHASLOCK;
+ fp->f_iflags |= FIF_HASLOCK;
}
if (localtrunc) {
if ((fp->f_flag & FWRITE) == 0)
@@ -1289,7 +1289,7 @@ sys_fhopen(struct proc *p, void *v, register_t *retval)
goto bad;
}
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
- fp->f_flag |= FHASLOCK;
+ fp->f_iflags |= FIF_HASLOCK;
}
VOP_UNLOCK(vp, 0, p);
*retval = indx;