aboutsummaryrefslogtreecommitdiff
path: root/sys/fs/ext2fs/ext2_balloc.c
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2017-02-15 19:50:26 +0000
committerEd Maste <emaste@FreeBSD.org>2017-02-15 19:50:26 +0000
commit1dc349ab9564b54c1b1f619045e95f966a9aae86 (patch)
tree9430648d462fa23db629b080e6fa38b22a37260c /sys/fs/ext2fs/ext2_balloc.c
parent605703b5dfe92b64a2127637f30db6385a89f685 (diff)
downloadsrc-1dc349ab9564b54c1b1f619045e95f966a9aae86.tar.gz
src-1dc349ab9564b54c1b1f619045e95f966a9aae86.zip
prefix UFS symbols with UFS_ to reduce namespace pollution
Specifically: ROOTINO -> UFS_ROOTINO WINO -> UFS_WINO NXADDR -> UFS_NXADDR NDADDR -> UFS_NDADDR NIADDR -> UFS_NIADDR MAXSYMLINKLEN_UFS[12] -> UFS[12]_MAXSYMLINKLEN (for consistency) Also prefix ext2's and nandfs's NDADDR and NIADDR with EXT2_ and NANDFS_ Reviewed by: kib, mckusick Obtained from: NetBSD MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D9536
Notes
Notes: svn path=/head/; revision=313780
Diffstat (limited to 'sys/fs/ext2fs/ext2_balloc.c')
-rw-r--r--sys/fs/ext2fs/ext2_balloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/ext2fs/ext2_balloc.c b/sys/fs/ext2fs/ext2_balloc.c
index fcfccc2f6d53..d45791e22cde 100644
--- a/sys/fs/ext2fs/ext2_balloc.c
+++ b/sys/fs/ext2fs/ext2_balloc.c
@@ -64,7 +64,7 @@ ext2_balloc(struct inode *ip, e2fs_lbn_t lbn, int size, struct ucred *cred,
struct ext2mount *ump;
struct buf *bp, *nbp;
struct vnode *vp = ITOV(ip);
- struct indir indirs[NIADDR + 2];
+ struct indir indirs[EXT2_NIADDR + 2];
e4fs_daddr_t nb, newb;
e2fs_daddr_t *bap, pref;
int osize, nsize, num, i, error;
@@ -85,9 +85,9 @@ ext2_balloc(struct inode *ip, e2fs_lbn_t lbn, int size, struct ucred *cred,
ip->i_next_alloc_goal++;
}
/*
- * The first NDADDR blocks are direct blocks
+ * The first EXT2_NDADDR blocks are direct blocks
*/
- if (lbn < NDADDR) {
+ if (lbn < EXT2_NDADDR) {
nb = ip->i_db[lbn];
/*
* no new block is to be allocated, and no need to expand