diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2012-04-22 05:43:15 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2012-04-22 05:43:15 +0000 |
| commit | 2ca2111afa9d6ac1630b3e28226abd9d97b4e431 (patch) | |
| tree | 32e68dee26390c4060d3b55fa2b8bded925f1c94 /sys/dev | |
| parent | 856ac2591baaf667bfcf163c7fbcb9f5a766137e (diff) | |
Add struct proc * argument to FRELE() and FILE_SET_MATURE() in
anticipation of further changes to closef(). No binary change.
ok krw@ miod@ deraadt@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/diskmap.c | 6 | ||||
| -rw-r--r-- | sys/dev/systrace.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/diskmap.c b/sys/dev/diskmap.c index c2197d8abd7..8cd3182a342 100644 --- a/sys/dev/diskmap.c +++ b/sys/dev/diskmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskmap.c,v 1.6 2011/07/07 23:45:00 matthew Exp $ */ +/* $OpenBSD: diskmap.c,v 1.7 2012/04/22 05:43:14 guenther Exp $ */ /* * Copyright (c) 2009, 2010 Joel Sing <jsing@openbsd.org> @@ -116,7 +116,7 @@ diskmapioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) VOP_UNLOCK(vp, 0, p); - FRELE(fp); + FRELE(fp, p); fdpunlock(fdp); free(devname, M_DEVBUF); @@ -126,7 +126,7 @@ bad: if (vp) vput(vp); if (fp) - FRELE(fp); + FRELE(fp, p); fdpunlock(fdp); diff --git a/sys/dev/systrace.c b/sys/dev/systrace.c index 16d01c7d53d..3fc6d98c81c 100644 --- a/sys/dev/systrace.c +++ b/sys/dev/systrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: systrace.c,v 1.62 2012/02/20 22:23:39 guenther Exp $ */ +/* $OpenBSD: systrace.c,v 1.63 2012/04/22 05:43:14 guenther Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -539,7 +539,7 @@ systraceioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) f->f_ops = &systracefops; f->f_data = (caddr_t) fst; *(int *)data = fd; - FILE_SET_MATURE(f); + FILE_SET_MATURE(f, p); break; default: error = EINVAL; |