From: deraadt <deraadt@openbsd.org>
Date: Thu, 2 May 1996 13:05:14 +0000 (+0000)
Subject: sync with netbsd
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=67e8bd9464dbd8f40a846187cb2176cc3e8fdb8c;p=openbsd

sync with netbsd
---

diff --git a/sys/adosfs/adutil.c b/sys/adosfs/adutil.c
index afcbeb0d9ce..259c488b01e 100644
--- a/sys/adosfs/adutil.c
+++ b/sys/adosfs/adutil.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: adutil.c,v 1.4 1996/04/21 22:14:38 deraadt Exp $	*/
-/*	$NetBSD: adutil.c,v 1.9 1996/04/05 05:06:10 mhitch Exp $	*/
+/*	$OpenBSD: adutil.c,v 1.5 1996/05/02 13:05:14 deraadt Exp $	*/
+/*	$NetBSD: adutil.c,v 1.10 1996/04/23 05:18:29 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -100,7 +100,7 @@ adosfs_getblktype(amp, bp)
 {
 	if (adoscksum(bp, amp->nwords)) {
 #ifdef DIAGNOSTIC
-		printf("adosfs: aget: cksum of blk %d failed\n",
+		printf("adosfs: aget: cksum of blk %ld failed\n",
 		       bp->b_blkno / amp->secsperblk);
 #endif
 		return (-1);
@@ -111,7 +111,7 @@ adosfs_getblktype(amp, bp)
 	 */
 	if (adoswordn(bp, 0) != BPT_SHORT) {
 #ifdef DIAGNOSTIC
-		printf("adosfs: aget: bad primary type blk %d\n",
+		printf("adosfs: aget: bad primary type blk %ld\n",
 		       bp->b_blkno / amp->secsperblk);
 #endif
 		return (-1);
diff --git a/sys/adosfs/advfsops.c b/sys/adosfs/advfsops.c
index f48c4e8d46e..0b332d71c5e 100644
--- a/sys/adosfs/advfsops.c
+++ b/sys/adosfs/advfsops.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: advfsops.c,v 1.5 1996/04/21 22:14:39 deraadt Exp $	*/
-/*	$NetBSD: advfsops.c,v 1.14.2.1 1995/11/10 16:05:16 chopps Exp $	*/
+/*	$OpenBSD: advfsops.c,v 1.6 1996/05/02 13:05:16 deraadt Exp $	*/
+/*	$NetBSD: advfsops.c,v 1.19 1996/04/28 06:18:12 mhitch Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -433,6 +433,7 @@ adosfs_vget(mp, an, vpp)
 			namlen++;
 		}
 		ap->slinkto[namlen] = 0;
+		ap->fsize = namlen;
 		break;
 	default:
 		brelse(bp);
@@ -580,7 +581,7 @@ adosfs_loadbitmap(amp)
 			break;
 		if (adoscksum(mapbp, amp->nwords)) {
 #ifdef DIAGNOSTIC
-			printf("adosfs: loadbitmap - cksum of blk %d failed\n",
+			printf("adosfs: loadbitmap - cksum of blk %ld failed\n",
 			    adoswordn(bp, blkix));
 #endif
 			/* XXX Force read-only?  Set free space 0? */
diff --git a/sys/adosfs/advnops.c b/sys/adosfs/advnops.c
index ab2fd4a6ba7..ca31e1dece8 100644
--- a/sys/adosfs/advnops.c
+++ b/sys/adosfs/advnops.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: advnops.c,v 1.4 1996/04/21 22:14:40 deraadt Exp $	*/
-/*	$NetBSD: advnops.c,v 1.22 1995/08/18 15:14:38 chopps Exp $	*/
+/*	$OpenBSD: advnops.c,v 1.5 1996/05/02 13:05:18 deraadt Exp $	*/
+/*	$NetBSD: advnops.c,v 1.28 1996/04/23 05:18:32 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -312,14 +312,14 @@ adosfs_read(v)
 				error = EIO; /* OFS needs the complete block */
 			else if (adoswordn(bp, 0) != BPT_DATA) {
 #ifdef DIAGNOSTIC
-				printf("adosfs: bad primary type blk %d\n",
+				printf("adosfs: bad primary type blk %ld\n",
 				       bp->b_blkno / amp->secsperblk);
 #endif
 				error=EINVAL;
 			}
 			else if ( adoscksum(bp, ap->nwords)) {
 #ifdef DIAGNOSTIC
-				printf("adosfs: blk %d failed cksum.\n",
+				printf("adosfs: blk %ld failed cksum.\n",
 				       bp->b_blkno / amp->secsperblk);
 #endif
 				error=EINVAL;
@@ -654,7 +654,7 @@ adosfs_bmap(v)
 			goto reterr;
 		if (adoscksum(flbp, ap->nwords)) {
 #ifdef DIAGNOSTIC
-			printf("adosfs: blk %d failed cksum.\n", nb);
+			printf("adosfs: blk %ld failed cksum.\n", nb);
 #endif
 			brelse(flbp);
 			error = EINVAL;
@@ -680,7 +680,7 @@ adosfs_bmap(v)
 		*bnp = adoswordn(flbp, flblkoff) * ap->amp->secsperblk;
 	} else {
 #ifdef DIAGNOSTIC
-		printf("flblk offset %d too large in lblk %d blk %d\n", 
+		printf("flblk offset %ld too large in lblk %ld blk %d\n", 
 		    flblkoff, bn / ap->amp->secsperblk , flbp->b_blkno);
 #endif
 		error = EINVAL;