Add struct proc * argument to FRELE() and FILE_SET_MATURE() in

anticipation of further changes to closef().  No binary change.

ok krw@ miod@ deraadt@

9 files changed, 23 insertions, 23 deletions

diff --git a/sys/compat/linux/linux_blkio.c b/sys/compat/linux/linux_blkio.c
index 09f47187289..287ae3c7140 100644
--- a/sys/compat/linux/linux_blkio.c
+++ b/sys/compat/linux/linux_blkio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_blkio.c,v 1.8 2010/05/18 04:41:14 dlg Exp $	*/
+/*	$OpenBSD: linux_blkio.c,v 1.9 2012/04/22 05:43:14 guenther Exp $	*/
 /*	$NetBSD: linux_blkio.c,v 1.3 2001/01/18 17:48:04 tv Exp $	*/
 
 /*
@@ -118,6 +118,6 @@ linux_ioctl_blkio(struct proc *p, struct linux_sys_ioctl_args *uap,
 		error = ENOTTY;
 	}
 
-	FRELE(fp);
+	FRELE(fp, p);
 	return error;
 }
diff --git a/sys/compat/linux/linux_cdrom.c b/sys/compat/linux/linux_cdrom.c
index 49979d2640a..38385553335 100644
--- a/sys/compat/linux/linux_cdrom.c
+++ b/sys/compat/linux/linux_cdrom.c
@@ -1,5 +1,5 @@
 
-/*	$OpenBSD: linux_cdrom.c,v 1.8 2002/03/14 01:26:50 millert Exp $	*/
+/*	$OpenBSD: linux_cdrom.c,v 1.9 2012/04/22 05:43:14 guenther Exp $	*/
 /*
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
  * All rights reserved.
@@ -293,6 +293,6 @@ linux_ioctl_cdrom(p, v, retval)
 	error = sys_ioctl(p, &ia, retval);
 
 out:
-	FRELE(fp);
+	FRELE(fp, p);
 	return (error);
 }
diff --git a/sys/compat/linux/linux_fdio.c b/sys/compat/linux/linux_fdio.c
index 46bd15290db..e84801153d4 100644
--- a/sys/compat/linux/linux_fdio.c
+++ b/sys/compat/linux/linux_fdio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_fdio.c,v 1.6 2002/03/14 01:26:50 millert Exp $	*/
+/*	$OpenBSD: linux_fdio.c,v 1.7 2012/04/22 05:43:14 guenther Exp $	*/
 /*	$NetBSD: linux_fdio.c,v 1.1 2000/12/10 14:12:16 fvdl Exp $	*/
 
 /*
@@ -145,6 +145,6 @@ linux_ioctl_fdio(struct proc *p, struct linux_sys_ioctl_args *uap,
 		error = EINVAL;
 	}
 
-	FRELE(fp);
+	FRELE(fp, p);
 	return 0;
 }
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 5c1a1bd2cec..e06c8b1bbfa 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_file.c,v 1.26 2011/11/25 10:10:05 robert Exp $	*/
+/*	$OpenBSD: linux_file.c,v 1.27 2012/04/22 05:43:14 guenther Exp $	*/
 /*	$NetBSD: linux_file.c,v 1.15 1996/05/20 01:59:09 fvdl Exp $	*/
 
 /*
@@ -200,7 +200,7 @@ linux_sys_open(p, v, retval)
 		FREF(fp);
                 if (fp->f_type == DTYPE_VNODE)
                         (fp->f_ops->fo_ioctl) (fp, TIOCSCTTY, (caddr_t) 0, p);
-		FRELE(fp);
+		FRELE(fp, p);
         }
 	return 0;
 }
@@ -425,7 +425,7 @@ linux_sys_fcntl(p, v, retval)
 			return EINVAL;
 		FREF(fp);
 		error = VOP_GETATTR(vp, &va, p->p_ucred, p);
-		FRELE(fp);
+		FRELE(fp, p);
 		if (error)
 			return error;
 		d_tty = cdevsw[major(va.va_rdev)].d_tty;
diff --git a/sys/compat/linux/linux_hdio.c b/sys/compat/linux/linux_hdio.c
index ac96e740c10..3071eea93e0 100644
--- a/sys/compat/linux/linux_hdio.c
+++ b/sys/compat/linux/linux_hdio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_hdio.c,v 1.7 2010/05/18 04:41:14 dlg Exp $	*/
+/*	$OpenBSD: linux_hdio.c,v 1.8 2012/04/22 05:43:14 guenther Exp $	*/
 /*	$NetBSD: linux_hdio.c,v 1.1 2000/12/10 14:12:17 fvdl Exp $	*/
 
 /*
@@ -179,6 +179,6 @@ linux_ioctl_hdio(struct proc *p, struct linux_sys_ioctl_args *uap,
 		error = EINVAL;
 	}
 
-	FRELE(fp);
+	FRELE(fp, p);
 	return error;
 }
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 544bfe72cde..4977320ae6d 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_misc.c,v 1.75 2012/04/10 15:50:52 guenther Exp $	*/
+/*	$OpenBSD: linux_misc.c,v 1.76 2012/04/22 05:43:14 guenther Exp $	*/
 /*	$NetBSD: linux_misc.c,v 1.27 1996/05/20 01:59:21 fvdl Exp $	*/
 
 /*-
@@ -1023,7 +1023,7 @@ getdents_common(p, v, retval, is64bit)
 	if (nbytes == 1) {	/* emulating old, broken behaviour */
 		/* readdir(2) case. Always struct dirent. */
 		if (is64bit) {
-			FRELE(fp);
+			FRELE(fp, p);
 			return (EINVAL);
 		}
 		nbytes = sizeof(struct linux_dirent);
@@ -1043,7 +1043,7 @@ getdents_common(p, v, retval, is64bit)
 	*retval = nbytes - args.resid;
 
  exit:
-	FRELE(fp);
+	FRELE(fp, p);
 	return (error);
 }
 
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index 21598960a36..d17d67811e0 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_socket.c,v 1.43 2011/12/03 12:38:30 fgsch Exp $	*/
+/*	$OpenBSD: linux_socket.c,v 1.44 2012/04/22 05:43:14 guenther Exp $	*/
 /*	$NetBSD: linux_socket.c,v 1.14 1996/04/05 00:01:50 christos Exp $	*/
 
 /*
@@ -1074,7 +1074,7 @@ linux_setsockopt(p, v, retval)
 	}
 	error = sosetopt(so, level, name, m);
 bad:
-	FRELE(fp);
+	FRELE(fp, p);
 	return (error);
 }
 
@@ -1588,6 +1588,6 @@ out:
 		error = sys_ioctl(p, &ia, retval);
 	}
 
-	FRELE(fp);
+	FRELE(fp, p);
 	return (error);
 }
diff --git a/sys/compat/linux/linux_termios.c b/sys/compat/linux/linux_termios.c
index b65c1f956bb..cda6f1aeb51 100644
--- a/sys/compat/linux/linux_termios.c
+++ b/sys/compat/linux/linux_termios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_termios.c,v 1.15 2003/04/05 20:30:18 millert Exp $	*/
+/*	$OpenBSD: linux_termios.c,v 1.16 2012/04/22 05:43:14 guenther Exp $	*/
 /*	$NetBSD: linux_termios.c,v 1.3 1996/04/05 00:01:54 christos Exp $	*/
 
 /*
@@ -720,6 +720,6 @@ linux_ioctl_termios(p, v, retval)
 	error = sys_ioctl(p, &ia, retval);
 
 out:
-	FRELE(fp);
+	FRELE(fp, p);
 	return (error);
 }
diff --git a/sys/compat/ossaudio/ossaudio.c b/sys/compat/ossaudio/ossaudio.c
index da12d6791e9..49581dcc41e 100644
--- a/sys/compat/ossaudio/ossaudio.c
+++ b/sys/compat/ossaudio/ossaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ossaudio.c,v 1.13 2008/06/26 05:42:14 ray Exp $	*/
+/*	$OpenBSD: ossaudio.c,v 1.14 2012/04/22 05:43:14 guenther Exp $	*/
 /*	$NetBSD: ossaudio.c,v 1.23 1997/10/19 07:41:52 augustss Exp $	*/
 
 /*
@@ -88,7 +88,7 @@ oss_ioctl_audio(p, uap, retval)
 	FREF(fp);
 
 	if ((fp->f_flag & (FREAD | FWRITE)) == 0) {
-		FRELE(fp);
+		FRELE(fp, p);
 		return (EBADF);
 	}
 
@@ -490,7 +490,7 @@ oss_ioctl_audio(p, uap, retval)
 		break;
 	}
 
-	FRELE(fp);
+	FRELE(fp, p);
 	return (error);
 }
 
@@ -805,7 +805,7 @@ oss_ioctl_mixer(p, uap, retval)
 	error = copyout(&idat, SCARG(uap, data), sizeof idat);
 
 out:
-	FRELE(fp);
+	FRELE(fp, p);
 	return (error);
 }