diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-04-21 22:33:19 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-04-21 22:33:19 +0000 |
| commit | 67d88b0a9910a68bb666b448d2dac29cb4d3d8c2 (patch) | |
| tree | 967b89f6e07398a22bd8c76d30179b648776542d /sys/msdosfs | |
| parent | ba95d3c1d69cdb251d15a12ebf70f50b0ea2019b (diff) | |
partial sync with netbsd 960418, more to come
Diffstat (limited to 'sys/msdosfs')
| -rw-r--r-- | sys/msdosfs/msdosfs_vfsops.c | 10 | ||||
| -rw-r--r-- | sys/msdosfs/msdosfs_vnops.c | 17 |
2 files changed, 16 insertions, 11 deletions
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c index 213f37c42ca..ef8f70647da 100644 --- a/sys/msdosfs/msdosfs_vfsops.c +++ b/sys/msdosfs/msdosfs_vfsops.c @@ -1,5 +1,5 @@ -/* $OpenBSD: msdosfs_vfsops.c,v 1.4 1996/02/29 10:46:57 niklas Exp $ */ -/* $NetBSD: msdosfs_vfsops.c,v 1.40 1996/02/11 22:48:16 ws Exp $ */ +/* $OpenBSD: msdosfs_vfsops.c,v 1.5 1996/04/21 22:28:22 deraadt Exp $ */ +/* $NetBSD: msdosfs_vfsops.c,v 1.41 1996/03/20 00:45:40 thorpej Exp $ */ /*- * Copyright (C) 1994, 1995 Wolfgang Solfrank. @@ -687,9 +687,9 @@ loop: if (VOP_ISLOCKED(vp)) continue; dep = VTODE(vp); - if (dep->de_flag - & (DE_ACCESS | DE_CREATE | DE_UPDATE | DE_MODIFIED) == 0 - && vp->v_dirtyblkhd.lh_first == NULL) + if (((dep->de_flag + & (DE_ACCESS | DE_CREATE | DE_UPDATE | DE_MODIFIED)) == 0) + && (vp->v_dirtyblkhd.lh_first == NULL)) continue; if (vget(vp, 1)) goto loop; diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index af3b5191b17..8a09cc6a58f 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,5 +1,5 @@ -/* $OpenBSD: msdosfs_vnops.c,v 1.4 1996/04/19 16:10:03 niklas Exp $ */ -/* $NetBSD: msdosfs_vnops.c,v 1.47 1996/03/08 18:13:10 scottr Exp $ */ +/* $OpenBSD: msdosfs_vnops.c,v 1.5 1996/04/21 22:28:24 deraadt Exp $ */ +/* $NetBSD: msdosfs_vnops.c,v 1.48 1996/03/20 00:45:43 thorpej Exp $ */ /*- * Copyright (C) 1994, 1995 Wolfgang Solfrank. @@ -1663,7 +1663,9 @@ msdosfs_lock(v) } */ *ap = v; register struct vnode *vp = ap->a_vp; register struct denode *dep; +#ifdef DIAGNOSTIC struct proc *p = curproc; /* XXX */ +#endif start: while (vp->v_flag & VXLOCK) { @@ -1709,7 +1711,9 @@ msdosfs_unlock(v) struct vnode *vp; } */ *ap = v; register struct denode *dep = VTODE(ap->a_vp); +#ifdef DIAGNOSTIC struct proc *p = curproc; /* XXX */ +#endif #ifdef DIAGNOSTIC if ((dep->de_flag & DE_LOCKED) == 0) { @@ -1845,11 +1849,12 @@ msdosfs_print(v) } */ *ap = v; struct denode *dep = VTODE(ap->a_vp); - printf("tag VT_MSDOSFS, startcluster %d, dircluster %d, diroffset %d ", - dep->de_StartCluster, dep->de_dirclust, dep->de_diroffset); + printf( + "tag VT_MSDOSFS, startcluster %d, dircluster %ld, diroffset %ld ", + dep->de_StartCluster, dep->de_dirclust, dep->de_diroffset); printf(" dev %d, %d, %s\n", - major(dep->de_dev), minor(dep->de_dev), - dep->de_flag & DE_LOCKED ? "(LOCKED)" : ""); + major(dep->de_dev), minor(dep->de_dev), + dep->de_flag & DE_LOCKED ? "(LOCKED)" : ""); #ifdef DIAGNOSTIC if (dep->de_lockholder) { printf(" owner pid %d", dep->de_lockholder); |