diff options
| author | dholland <dholland@NetBSD.org> | 2013-01-22 09:39:11 +0000 |
|---|---|---|
| committer | dholland <dholland@NetBSD.org> | 2013-01-22 09:39:11 +0000 |
| commit | d8eae7d25b49bac06cbad931bc3978073c028d65 (patch) | |
| tree | 52fd0c429caf914f7378c1ccb0ce2a1d28b30a9e /sys/lib | |
| parent | 445568dc95e8e9c89e42d485d795140cae260244 (diff) | |
Stuff UFS_ in front of a few of ufs's symbols to reduce namespace
pollution. Specifically:
ROOTINO -> UFS_ROOTINO
WINO -> UFS_WINO
NXADDR -> UFS_NXADDR
NDADDR -> UFS_NDADDR
NIADDR -> UFS_NIADDR
MAXSYMLINKLEN -> UFS_MAXSYMLINKLEN
MAXSYMLINKLEN_UFS[12] -> UFS[12]_MAXSYMLINKLEN (for consistency)
Sort out ext2fs's misuse of NDADDR and NIADDR; fortunately, these have
the same values in ext2fs and ffs.
No functional change intended.
Diffstat (limited to 'sys/lib')
| -rw-r--r-- | sys/lib/libsa/ext2fs.c | 38 | ||||
| -rw-r--r-- | sys/lib/libsa/ufs.c | 26 |
2 files changed, 32 insertions, 32 deletions
diff --git a/sys/lib/libsa/ext2fs.c b/sys/lib/libsa/ext2fs.c index a6eac98a864..9563938aabb 100644 --- a/sys/lib/libsa/ext2fs.c +++ b/sys/lib/libsa/ext2fs.c @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs.c,v 1.13 2012/05/21 21:34:16 dsl Exp $ */ +/* $NetBSD: ext2fs.c,v 1.14 2013/01/22 09:39:14 dholland Exp $ */ /* * Copyright (c) 1997 Manuel Bouyer. @@ -240,37 +240,37 @@ block_map(struct open_file *f, indp_t file_block, indp_t *disk_block_p) /* * Index structure of an inode: * - * e2di_blocks[0..NDADDR-1] + * e2di_blocks[0..EXT2FS_NDADDR-1] * hold block numbers for blocks - * 0..NDADDR-1 + * 0..EXT2FS_NDADDR-1 * - * e2di_blocks[NDADDR+0] - * block NDADDR+0 is the single indirect block + * e2di_blocks[EXT2FS_NDADDR+0] + * block EXT2FS_NDADDR+0 is the single indirect block * holds block numbers for blocks - * NDADDR .. NDADDR + NINDIR(fs)-1 + * EXT2FS_NDADDR .. EXT2FS_NDADDR + NINDIR(fs)-1 * - * e2di_blocks[NDADDR+1] - * block NDADDR+1 is the double indirect block + * e2di_blocks[EXT2FS_NDADDR+1] + * block EXT2FS_NDADDR+1 is the double indirect block * holds block numbers for INDEX blocks for blocks - * NDADDR + NINDIR(fs) .. - * NDADDR + NINDIR(fs) + NINDIR(fs)**2 - 1 + * EXT2FS_NDADDR + NINDIR(fs) .. + * EXT2FS_NDADDR + NINDIR(fs) + NINDIR(fs)**2 - 1 * - * e2di_blocks[NDADDR+2] - * block NDADDR+2 is the triple indirect block + * e2di_blocks[EXT2FS_NDADDR+2] + * block EXT2FS_NDADDR+2 is the triple indirect block * holds block numbers for double-indirect * blocks for blocks - * NDADDR + NINDIR(fs) + NINDIR(fs)**2 .. - * NDADDR + NINDIR(fs) + NINDIR(fs)**2 + * EXT2FS_NDADDR + NINDIR(fs) + NINDIR(fs)**2 .. + * EXT2FS_NDADDR + NINDIR(fs) + NINDIR(fs)**2 * + NINDIR(fs)**3 - 1 */ - if (file_block < NDADDR) { + if (file_block < EXT2FS_NDADDR) { /* Direct block. */ *disk_block_p = fs2h32(fp->f_di.e2di_blocks[file_block]); return 0; } - file_block -= NDADDR; + file_block -= EXT2FS_NDADDR; ind_cache = file_block >> LN2_IND_CACHE_SZ; if (ind_cache == fp->f_ind_cache_block) { @@ -283,14 +283,14 @@ block_map(struct open_file *f, indp_t file_block, indp_t *disk_block_p) level += fp->f_nishift; if (file_block < (indp_t)1 << level) break; - if (level > NIADDR * fp->f_nishift) + if (level > EXT2FS_NIADDR * fp->f_nishift) /* Block number too high */ return EFBIG; file_block -= (indp_t)1 << level; } ind_block_num = - fs2h32(fp->f_di.e2di_blocks[NDADDR + (level / fp->f_nishift - 1)]); + fs2h32(fp->f_di.e2di_blocks[EXT2FS_NDADDR + (level / fp->f_nishift - 1)]); for (;;) { level -= fp->f_nishift; @@ -1000,7 +1000,7 @@ void e2fs_i_bswap(struct ext2fs_dinode *old, struct ext2fs_dinode *new) new->e2di_dacl = bswap32(old->e2di_dacl); new->e2di_faddr = bswap32(old->e2di_faddr); memcpy(&new->e2di_blocks[0], &old->e2di_blocks[0], - (NDADDR + NIADDR) * sizeof(uint32_t)); + (EXT2FS_NDADDR + EXT2FS_NIADDR) * sizeof(uint32_t)); } #endif diff --git a/sys/lib/libsa/ufs.c b/sys/lib/libsa/ufs.c index 7fd728bf954..7caf2205a1d 100644 --- a/sys/lib/libsa/ufs.c +++ b/sys/lib/libsa/ufs.c @@ -1,4 +1,4 @@ -/* $NetBSD: ufs.c,v 1.58 2012/05/21 21:34:16 dsl Exp $ */ +/* $NetBSD: ufs.c,v 1.59 2013/01/22 09:39:14 dholland Exp $ */ /*- * Copyright (c) 1993 @@ -324,33 +324,33 @@ block_map(struct open_file *f, indp_t file_block, indp_t *disk_block_p) /* * Index structure of an inode: * - * di_db[0..NDADDR-1] hold block numbers for blocks - * 0..NDADDR-1 + * di_db[0..UFS_NDADDR-1] hold block numbers for blocks + * 0..UFS_NDADDR-1 * * di_ib[0] index block 0 is the single indirect block * holds block numbers for blocks - * NDADDR .. NDADDR + NINDIR(fs)-1 + * UFS_NDADDR .. UFS_NDADDR + NINDIR(fs)-1 * * di_ib[1] index block 1 is the double indirect block * holds block numbers for INDEX blocks for blocks - * NDADDR + NINDIR(fs) .. - * NDADDR + NINDIR(fs) + NINDIR(fs)**2 - 1 + * UFS_NDADDR + NINDIR(fs) .. + * UFS_NDADDR + NINDIR(fs) + NINDIR(fs)**2 - 1 * * di_ib[2] index block 2 is the triple indirect block * holds block numbers for double-indirect * blocks for blocks - * NDADDR + NINDIR(fs) + NINDIR(fs)**2 .. - * NDADDR + NINDIR(fs) + NINDIR(fs)**2 + * UFS_NDADDR + NINDIR(fs) + NINDIR(fs)**2 .. + * UFS_NDADDR + NINDIR(fs) + NINDIR(fs)**2 * + NINDIR(fs)**3 - 1 */ - if (file_block < NDADDR) { + if (file_block < UFS_NDADDR) { /* Direct block. */ *disk_block_p = fp->f_di.di_db[file_block]; return 0; } - file_block -= NDADDR; + file_block -= UFS_NDADDR; ind_cache = file_block >> LN2_IND_CACHE_SZ; if (ind_cache == fp->f_ind_cache_block) { @@ -362,7 +362,7 @@ block_map(struct open_file *f, indp_t file_block, indp_t *disk_block_p) level += fp->f_nishift; if (file_block < (indp_t)1 << level) break; - if (level > NIADDR * fp->f_nishift) + if (level > UFS_NIADDR * fp->f_nishift) /* Block number too high */ return EFBIG; file_block -= (indp_t)1 << level; @@ -641,7 +641,7 @@ ufs_open(const char *path, struct open_file *f) /* alloc a block sized buffer used for all fs transfers */ fp->f_buf = alloc(fs->fs_bsize); - inumber = ROOTINO; + inumber = UFS_ROOTINO; if ((rc = read_inode(inumber, f)) != 0) goto out; @@ -740,7 +740,7 @@ ufs_open(const char *path, struct open_file *f) if (*cp != '/') inumber = parent_inumber; else - inumber = (ino32_t)ROOTINO; + inumber = (ino32_t)UFS_ROOTINO; if ((rc = read_inode(inumber, f)) != 0) goto out; |
