diff options
| author | kib <kib@FreeBSD.org> | 2007-05-31 11:51:53 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2007-05-31 11:51:53 +0000 |
| commit | f13486a2227b9165fce30aa40d12b728f327a909 (patch) | |
| tree | d5e88e86417c996e0e901ce9a43de8d9ae3ad44e /sys/fs/unionfs/union_subr.c | |
| parent | 7f276f0bff169823b786ea0a9bbdfe936361fcb4 (diff) | |
| download | FreeBSD-src-f13486a2227b9165fce30aa40d12b728f327a909.zip FreeBSD-src-f13486a2227b9165fce30aa40d12b728f327a909.tar.gz | |
Revert UF_OPENING workaround for CURRENT.
Change the VOP_OPEN(), vn_open() vnode operation and d_fdopen() cdev operation
argument from being file descriptor index into the pointer to struct file.
Proposed and reviewed by: jhb
Reviewed by: daichi (unionfs)
Approved by: re (kensmith)
Diffstat (limited to 'sys/fs/unionfs/union_subr.c')
| -rw-r--r-- | sys/fs/unionfs/union_subr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 4f66fb3..887ef70 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -913,7 +913,7 @@ unionfs_vn_create_on_upper(struct vnode **vpp, struct vnode *udvp, if ((error = VOP_CREATE(udvp, &vp, &cn, uvap)) != 0) goto unionfs_vn_create_on_upper_free_out1; - if ((error = VOP_OPEN(vp, fmode, cred, td, -1)) != 0) { + if ((error = VOP_OPEN(vp, fmode, cred, td, NULL)) != 0) { vput(vp); goto unionfs_vn_create_on_upper_free_out1; } @@ -1049,7 +1049,7 @@ unionfs_copyfile(struct unionfs_node *unp, int docopy, struct ucred *cred, } if (docopy != 0) { - error = VOP_OPEN(lvp, FREAD, cred, td, -1); + error = VOP_OPEN(lvp, FREAD, cred, td, NULL); if (error == 0) { error = unionfs_copyfile_core(lvp, uvp, cred, td); VOP_CLOSE(lvp, FREAD, cred, td); @@ -1110,7 +1110,7 @@ unionfs_check_rmdir(struct vnode *vp, struct ucred *cred, struct thread *td) return (0); /* open vnode */ - if ((error = VOP_OPEN(vp, FREAD, cred, td, -1)) != 0) + if ((error = VOP_OPEN(vp, FREAD, cred, td, NULL)) != 0) return (error); uio.uio_rw = UIO_READ; |
