summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2008-11-06 18:01:46 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2008-11-06 18:01:46 +0000
commit48081d20ed69195ad3e0e8b7945356104cfaf850 (patch)
treeb978cb6252c7ebbd4da079a745fcaef9cf996439 /sbin
parent35e23df985ac3d66fa061252ed6a6646d1bfbf4c (diff)
Have called pass pagesize into FS_KERNMAXFILESIZE(), because there is no
automatic symbol that has this information. PAGE_SIZE is simply not portable, or even fixed on some systems. ok otto
Diffstat (limited to 'sbin')
-rw-r--r--sbin/fsck_ffs/pass1.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 4da58abf8c9..e149dcf15ab 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pass1.c,v 1.28 2008/11/02 08:54:10 otto Exp $ */
+/* $OpenBSD: pass1.c,v 1.29 2008/11/06 18:01:44 deraadt Exp $ */
/* $NetBSD: pass1.c,v 1.16 1996/09/27 22:45:15 christos Exp $ */
/*
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pass1.c 8.1 (Berkeley) 6/5/93";
#else
-static const char rcsid[] = "$OpenBSD: pass1.c,v 1.28 2008/11/02 08:54:10 otto Exp $";
+static const char rcsid[] = "$OpenBSD: pass1.c,v 1.29 2008/11/06 18:01:44 deraadt Exp $";
#endif
#endif /* not lint */
@@ -155,7 +155,7 @@ checkinode(ino_t inumber, struct inodesc *idesc)
}
lastino = inumber;
/* This should match the file size limit in ffs_mountfs(). */
- kernmaxfilesize = FS_KERNMAXFILESIZE(&sblock);
+ kernmaxfilesize = FS_KERNMAXFILESIZE(getpagesize(), &sblock);
if (DIP(dp, di_size) > kernmaxfilesize ||
DIP(dp, di_size) > sblock.fs_maxfilesize ||
(mode == IFDIR && DIP(dp, di_size) > MAXDIRSIZE)) {