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/coda | |
| 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/coda')
| -rw-r--r-- | sys/fs/coda/coda_vnops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c index d1072da..d0b5c60 100644 --- a/sys/fs/coda/coda_vnops.c +++ b/sys/fs/coda/coda_vnops.c @@ -257,7 +257,7 @@ coda_open(struct vop_open_args *ap) cp->c_inode = inode; /* Open the cache file. */ - error = VOP_OPEN(vp, flag, cred, td, -1); + error = VOP_OPEN(vp, flag, cred, td, NULL); if (error) { printf("coda_open: VOP_OPEN on container failed %d\n", error); return (error); @@ -410,7 +410,7 @@ coda_rdwr(struct vnode *vp, struct uio *uiop, enum uio_rw rw, int ioflag, opened_internally = 1; MARK_INT_GEN(CODA_OPEN_STATS); error = VOP_OPEN(vp, (rw == UIO_READ ? FREAD : FWRITE), - cred, td, -1); + cred, td, NULL); printf("coda_rdwr: Internally Opening %p\n", vp); if (error) { printf("coda_rdwr: VOP_OPEN on container failed %d\n", error); @@ -1525,7 +1525,7 @@ coda_readdir(struct vop_readdir_args *ap) if (cp->c_ovp == NULL) { opened_internally = 1; MARK_INT_GEN(CODA_OPEN_STATS); - error = VOP_OPEN(vp, FREAD, cred, td, -1); + error = VOP_OPEN(vp, FREAD, cred, td, NULL); printf("coda_readdir: Internally Opening %p\n", vp); if (error) { printf("coda_readdir: VOP_OPEN on container failed %d\n", error); |
