diff options
| author | anton <anton@cvs.openbsd.org> | 2019-02-24 09:11:10 +0000 |
|---|---|---|
| committer | anton <anton@cvs.openbsd.org> | 2019-02-24 09:11:10 +0000 |
| commit | 08cc7e0377268915f0aa8f950bf756f2604197f6 (patch) | |
| tree | 95c16b12c4161c2e2a10ac669baf46ef8d69c12d | |
| parent | 3d32e6b92c48da3621e92f72abab9354e09cf387 (diff) | |
initialize struct lockf fields in a consistent order; ok millert@ mpi@ visa@
| -rw-r--r-- | sys/kern/vfs_lockf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/vfs_lockf.c b/sys/kern/vfs_lockf.c index 07189111122..5e15f351905 100644 --- a/sys/kern/vfs_lockf.c +++ b/sys/kern/vfs_lockf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_lockf.c,v 1.33 2019/01/30 17:04:04 anton Exp $ */ +/* $OpenBSD: vfs_lockf.c,v 1.34 2019/02/24 09:11:09 anton Exp $ */ /* $NetBSD: vfs_lockf.c,v 1.7 1996/02/04 02:18:21 christos Exp $ */ /* @@ -243,15 +243,15 @@ lf_advlock(struct lockf_state **state, off_t size, caddr_t id, int op, ls_rele(ls); return (ENOLCK); } + lock->lf_flags = flags; + lock->lf_type = fl->l_type; lock->lf_start = start; lock->lf_end = end; lock->lf_id = id; lock->lf_state = ls; - lock->lf_type = fl->l_type; lock->lf_blk = NULL; - TAILQ_INIT(&lock->lf_blkhd); - lock->lf_flags = flags; lock->lf_pid = (flags & F_POSIX) ? p->p_p->ps_pid : -1; + TAILQ_INIT(&lock->lf_blkhd); switch (op) { case F_SETLK: |