diff options
| author | marcel <marcel@FreeBSD.org> | 2004-12-11 21:36:29 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2004-12-11 21:36:29 +0000 |
| commit | 4b9010775051e954ec85d1c9f2f7bb288546fbd0 (patch) | |
| tree | 99cb26791f48717f30060a1485e1b36b46ee5928 /sys | |
| parent | 860981b28ffdfd446b57ca2a66989e87f1362e9c (diff) | |
| download | FreeBSD-src-4b9010775051e954ec85d1c9f2f7bb288546fbd0.zip FreeBSD-src-4b9010775051e954ec85d1c9f2f7bb288546fbd0.tar.gz | |
Revert rev 1.233. The null-pointer function call (a dereference on
ia64) was not the result of a change in the vector operations. It
was caused by the NFS locking code using a FIFO and those bypassing
the vnode. This indirectly caused the panic. The NFS locking code has
been changed.
Requested by: phk
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/nfsclient/nfs_vnops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index cbe5fd8..294f9c3 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -3056,7 +3056,7 @@ nfsfifo_read(struct vop_read_args *ap) */ np->n_flag |= NACC; getnanotime(&np->n_atim); - return (vop_read(&fifo_specops, ap)); + return (fifo_specops.vop_read(ap)); } /* @@ -3072,7 +3072,7 @@ nfsfifo_write(struct vop_write_args *ap) */ np->n_flag |= NUPD; getnanotime(&np->n_mtim); - return (vop_write(&fifo_specops, ap)); + return (fifo_specops.vop_write(ap)); } /* @@ -3107,7 +3107,7 @@ nfsfifo_close(struct vop_close_args *ap) VOP_UNLOCK(vp, 0, ap->a_td); } } - return (vop_close(&fifo_specops, ap)); + return (fifo_specops.vop_close(ap)); } /* |
