diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-04-19 16:10:53 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-04-19 16:10:53 +0000 |
| commit | 7c4cfc5c047725e6c4c20e9adaa1ef4e70ff68d1 (patch) | |
| tree | d415490c429995abee8d4ce27fac8216028a989c /sys/msdosfs | |
| parent | 6b3902486151983e34413a0e5a4bead588217855 (diff) | |
NetBSD 960317 merge
Diffstat (limited to 'sys/msdosfs')
| -rw-r--r-- | sys/msdosfs/msdosfs_lookup.c | 6 | ||||
| -rw-r--r-- | sys/msdosfs/msdosfs_vnops.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c index 91d2fa813f0..63fb02a6353 100644 --- a/sys/msdosfs/msdosfs_lookup.c +++ b/sys/msdosfs/msdosfs_lookup.c @@ -1,5 +1,5 @@ -/* $OpenBSD: msdosfs_lookup.c,v 1.3 1996/02/29 10:46:55 niklas Exp $ */ -/* $NetBSD: msdosfs_lookup.c,v 1.25 1996/02/09 19:13:47 christos Exp $ */ +/* $OpenBSD: msdosfs_lookup.c,v 1.4 1996/04/19 16:10:00 niklas Exp $ */ +/* $NetBSD: msdosfs_lookup.c,v 1.26 1996/03/07 13:30:46 ws Exp $ */ /*- * Copyright (C) 1994, 1995 Wolfgang Solfrank. @@ -917,7 +917,7 @@ removede(pdep, dep) dep->de_refcnt--; do { error = pcbmap(pdep, de_cluster(pmp, offset), &bn, 0, &blsize); - if (error); + if (error) return error; error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp); if (error) { diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index f3d2523038f..af3b5191b17 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,5 +1,5 @@ -/* $OpenBSD: msdosfs_vnops.c,v 1.3 1996/02/29 10:46:59 niklas Exp $ */ -/* $NetBSD: msdosfs_vnops.c,v 1.46 1996/02/09 19:13:53 christos Exp $ */ +/* $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 $ */ /*- * Copyright (C) 1994, 1995 Wolfgang Solfrank. @@ -1483,7 +1483,7 @@ msdosfs_readdir(v) strcpy(dirbuf.d_name, ".."); break; } - dirbuf.d_reclen = DIRSIZ(&dirbuf); + dirbuf.d_reclen = DIRENT_SIZE(&dirbuf); if (uio->uio_resid < dirbuf.d_reclen) goto out; error = uiomove((caddr_t) &dirbuf, @@ -1590,7 +1590,7 @@ msdosfs_readdir(v) else dirbuf.d_name[dirbuf.d_namlen] = 0; chksum = -1; - dirbuf.d_reclen = DIRSIZ(&dirbuf); + dirbuf.d_reclen = DIRENT_SIZE(&dirbuf); if (uio->uio_resid < dirbuf.d_reclen) { brelse(bp); goto out; |