summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/fs/unionfs/union_subr.c4
-rw-r--r--sys/fs/unionfs/union_vnops.c6
-rw-r--r--sys/kern/vfs_extattr.c4
-rw-r--r--sys/kern/vfs_syscalls.c4
-rw-r--r--sys/miscfs/union/union_subr.c4
-rw-r--r--sys/miscfs/union/union_vnops.c6
6 files changed, 14 insertions, 14 deletions
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index cbbd171..7d51365 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_subr.c 8.4 (Berkeley) 2/17/94
- * $Id: union_subr.c,v 1.5 1994/10/10 07:55:46 phk Exp $
+ * $Id: union_subr.c,v 1.6 1995/05/30 08:07:25 rgrimes Exp $
*/
#include <sys/param.h>
@@ -716,7 +716,7 @@ union_vn_close(vp, fmode, cred, p)
{
if (fmode & FWRITE)
--vp->v_writecount;
- return (VOP_CLOSE(vp, fmode));
+ return (VOP_CLOSE(vp, fmode, cred, p));
}
void
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 315fc62..855620c 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_vnops.c 8.6 (Berkeley) 2/17/94
- * $Id: union_vnops.c,v 1.9 1995/06/28 07:06:46 davidg Exp $
+ * $Id: union_vnops.c,v 1.10 1995/08/01 18:50:53 davidg Exp $
*/
#include <sys/param.h>
@@ -476,7 +476,7 @@ union_open(ap)
error = union_copyfile(p, cred,
tvp, un->un_uppervp);
VOP_UNLOCK(tvp);
- (void) VOP_CLOSE(tvp, FREAD);
+ (void) VOP_CLOSE(tvp, FREAD, cred, p);
} else {
VOP_UNLOCK(tvp);
}
@@ -503,7 +503,7 @@ union_open(ap)
* Ignoring error returns is not righ, either.
*/
for (i = 0; i < un->un_openl; i++) {
- (void) VOP_CLOSE(tvp, FREAD);
+ (void) VOP_CLOSE(tvp, FREAD, cred, p);
(void) VOP_OPEN(un->un_uppervp, FREAD, cred, p);
}
un->un_openl = 0;
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 8d6eca1..33f9ce5 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.30 1995/08/01 18:50:39 davidg Exp $
+ * $Id: vfs_syscalls.c,v 1.31 1995/08/11 11:31:08 davidg Exp $
*/
#include <sys/param.h>
@@ -2145,7 +2145,7 @@ unionread:
vp = union_lowervp(vp);
if (vp != NULLVP) {
VOP_LOCK(vp);
- error = VOP_OPEN(vp, FREAD);
+ error = VOP_OPEN(vp, FREAD, fp->f_cred, p);
VOP_UNLOCK(vp);
if (error) {
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 8d6eca1..33f9ce5 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.30 1995/08/01 18:50:39 davidg Exp $
+ * $Id: vfs_syscalls.c,v 1.31 1995/08/11 11:31:08 davidg Exp $
*/
#include <sys/param.h>
@@ -2145,7 +2145,7 @@ unionread:
vp = union_lowervp(vp);
if (vp != NULLVP) {
VOP_LOCK(vp);
- error = VOP_OPEN(vp, FREAD);
+ error = VOP_OPEN(vp, FREAD, fp->f_cred, p);
VOP_UNLOCK(vp);
if (error) {
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index cbbd171..7d51365 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_subr.c 8.4 (Berkeley) 2/17/94
- * $Id: union_subr.c,v 1.5 1994/10/10 07:55:46 phk Exp $
+ * $Id: union_subr.c,v 1.6 1995/05/30 08:07:25 rgrimes Exp $
*/
#include <sys/param.h>
@@ -716,7 +716,7 @@ union_vn_close(vp, fmode, cred, p)
{
if (fmode & FWRITE)
--vp->v_writecount;
- return (VOP_CLOSE(vp, fmode));
+ return (VOP_CLOSE(vp, fmode, cred, p));
}
void
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index 315fc62..855620c 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_vnops.c 8.6 (Berkeley) 2/17/94
- * $Id: union_vnops.c,v 1.9 1995/06/28 07:06:46 davidg Exp $
+ * $Id: union_vnops.c,v 1.10 1995/08/01 18:50:53 davidg Exp $
*/
#include <sys/param.h>
@@ -476,7 +476,7 @@ union_open(ap)
error = union_copyfile(p, cred,
tvp, un->un_uppervp);
VOP_UNLOCK(tvp);
- (void) VOP_CLOSE(tvp, FREAD);
+ (void) VOP_CLOSE(tvp, FREAD, cred, p);
} else {
VOP_UNLOCK(tvp);
}
@@ -503,7 +503,7 @@ union_open(ap)
* Ignoring error returns is not righ, either.
*/
for (i = 0; i < un->un_openl; i++) {
- (void) VOP_CLOSE(tvp, FREAD);
+ (void) VOP_CLOSE(tvp, FREAD, cred, p);
(void) VOP_OPEN(un->un_uppervp, FREAD, cred, p);
}
un->un_openl = 0;
OpenPOWER on IntegriCloud