Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stick UFS_ in front of these symbols:

Browse Source 
DIRBLKSIZ
   DIRECTSIZ
   DIRSIZ
   OLDDIRFMT
   NEWDIRFMT

Part of PR 47909.

(two stragglers in this commit; oops)
This commit is contained in:
dholland 2013-06-09 18:29:25 +00:00
parent 5a420c1b9a
commit 9daf003ef2
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sbin/newfs/mkfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mkfs.c,v 1.114 2013/03/17 12:25:36 mlelstv Exp $ */ /* $NetBSD: mkfs.c,v 1.115 2013/06/09 18:29:41 dholland Exp $ */
/* /*
* Copyright (c) 1980, 1989, 1993 * Copyright (c) 1980, 1989, 1993
@ -73,7 +73,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95"; static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
#else #else
__RCSID("$NetBSD: mkfs.c,v 1.114 2013/03/17 12:25:36 mlelstv Exp $"); __RCSID("$NetBSD: mkfs.c,v 1.115 2013/06/09 18:29:41 dholland Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -1253,14 +1253,14 @@ makedir(struct direct *protodir, int entries)
{ {
char *cp; char *cp;
int i, spcleft; int i, spcleft;
int dirblksiz = DIRBLKSIZ; int dirblksiz = UFS_DIRBLKSIZ;
if (isappleufs) if (isappleufs)
dirblksiz = APPLEUFS_DIRBLKSIZ; dirblksiz = APPLEUFS_DIRBLKSIZ;
memset(buf, 0, DIRBLKSIZ); memset(buf, 0, UFS_DIRBLKSIZ);
spcleft = dirblksiz; spcleft = dirblksiz;
for (cp = buf, i = 0; i < entries - 1; i++) { for (cp = buf, i = 0; i < entries - 1; i++) {
protodir[i].d_reclen = DIRSIZ(Oflag == 0, &protodir[i], 0); protodir[i].d_reclen = UFS_DIRSIZ(Oflag == 0, &protodir[i], 0);
copy_dir(&protodir[i], (struct direct*)cp); copy_dir(&protodir[i], (struct direct*)cp);
cp += protodir[i].d_reclen; cp += protodir[i].d_reclen;
spcleft -= protodir[i].d_reclen; spcleft -= protodir[i].d_reclen;
@ -1539,7 +1539,7 @@ setblock(struct fs *fs, unsigned char *cp, int h)
static void static void
copy_dir(struct direct *dir, struct direct *dbuf) copy_dir(struct direct *dir, struct direct *dbuf)
{ {
memcpy(dbuf, dir, DIRSIZ(Oflag == 0, dir, 0)); memcpy(dbuf, dir, UFS_DIRSIZ(Oflag == 0, dir, 0));
if (needswap) { if (needswap) {
dbuf->d_ino = bswap32(dir->d_ino); dbuf->d_ino = bswap32(dir->d_ino);
dbuf->d_reclen = bswap16(dir->d_reclen); dbuf->d_reclen = bswap16(dir->d_reclen);

7
sys/kern/vfs_getcwd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_getcwd.c,v 1.48 2012/11/05 17:24:11 dholland Exp $ */ /* $NetBSD: vfs_getcwd.c,v 1.49 2013/06/09 18:29:25 dholland Exp $ */
/*- /*-
* Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_getcwd.c,v 1.48 2012/11/05 17:24:11 dholland Exp $"); __KERNEL_RCSID(0, "$NetBSD: vfs_getcwd.c,v 1.49 2013/06/09 18:29:25 dholland Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -153,7 +153,8 @@ getcwd_scandir(struct vnode **lvpp, struct vnode **uvpp, char **bpp,
fileno = va.va_fileid; fileno = va.va_fileid;
dirbuflen = DIRBLKSIZ; /* I guess UFS_DIRBLKSIZ is a good guess at a good size to use? */
dirbuflen = UFS_DIRBLKSIZ;
if (dirbuflen < va.va_blocksize) if (dirbuflen < va.va_blocksize)
dirbuflen = va.va_blocksize; dirbuflen = va.va_blocksize;
dirbuf = kmem_alloc(dirbuflen, KM_SLEEP); dirbuf = kmem_alloc(dirbuflen, KM_SLEEP);