projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
syscons util remove use kbdcontrol & vidcontrol instead
[unix-history]
/
sys
/
nfs
/
nfs_vnops.c
diff --git
a/sys/nfs/nfs_vnops.c
b/sys/nfs/nfs_vnops.c
index
6033f0d
..
11b6d20
100644
(file)
--- a/
sys/nfs/nfs_vnops.c
+++ b/
sys/nfs/nfs_vnops.c
@@
-34,7
+34,7
@@
* SUCH DAMAGE.
*
* From: @(#)nfs_vnops.c 7.60 (Berkeley) 5/24/91
* SUCH DAMAGE.
*
* From: @(#)nfs_vnops.c 7.60 (Berkeley) 5/24/91
- * $Id$
+ * $Id
: nfs_vnops.c,v 1.6 1993/12/19 00:54:18 wollman Exp
$
*/
/*
*/
/*
@@
-776,7
+776,7
@@
nfs_mknod(ndp, vap, cred, p)
rdev = txdr_unsigned(vap->va_rdev);
#ifdef FIFO
else if (vap->va_type == VFIFO)
rdev = txdr_unsigned(vap->va_rdev);
#ifdef FIFO
else if (vap->va_type == VFIFO)
- rdev = 0xffffffff;
+ rdev = 0xffffffff
UL
;
#endif /* FIFO */
else {
VOP_ABORTOP(ndp);
#endif /* FIFO */
else {
VOP_ABORTOP(ndp);
@@
-1258,11
+1258,11
@@
nfs_readdirrpc(vp, uiop, cred)
struct ucred *cred;
{
register long len;
struct ucred *cred;
{
register long len;
- register struct direct *dp;
+ register struct direct *dp
= 0
;
register u_long *tl;
register caddr_t cp;
register long t1;
register u_long *tl;
register caddr_t cp;
register long t1;
- long tlen, lastlen;
+ long tlen, lastlen
= 0
;
caddr_t bpos, dpos, cp2;
u_long xid;
int error = 0;
caddr_t bpos, dpos, cp2;
u_long xid;
int error = 0;
@@
-1271,8
+1271,8
@@
nfs_readdirrpc(vp, uiop, cred)
caddr_t dpos2;
int siz;
int more_dirs = 1;
caddr_t dpos2;
int siz;
int more_dirs = 1;
- off_t off, savoff;
- struct direct *savdp;
+ off_t off, savoff
= 0
;
+ struct direct *savdp
= 0
;
struct nfsmount *nmp;
struct nfsnode *np = VTONFS(vp);
long tresid;
struct nfsmount *nmp;
struct nfsnode *np = VTONFS(vp);
long tresid;
@@
-1743,14
+1743,15
@@
nfs_advlock(vp, id, op, fl, flags)
struct flock *fl;
int flags;
{
struct flock *fl;
int flags;
{
+ register struct nfsnode *np = VTONFS(vp);
- return (
EOPNOTSUPP
);
+ return (
lf_advlock(&(np->n_lockf), np->n_size, id, op, fl, flags)
);
}
/*
* Print out the contents of an nfsnode.
*/
}
/*
* Print out the contents of an nfsnode.
*/
-int
+void
nfs_print(vp)
struct vnode *vp;
{
nfs_print(vp)
struct vnode *vp;
{
@@
-1769,5
+1770,4
@@
nfs_print(vp)
if (np->n_lockwaiter)
printf(" waiting pid %d", np->n_lockwaiter);
printf("\n");
if (np->n_lockwaiter)
printf(" waiting pid %d", np->n_lockwaiter);
printf("\n");
- return(0);
}
}