diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2018-03-17 01:48:27 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2018-03-17 01:48:27 +0000 |
| commit | 1e2b9afca9212aa3d6f9cfc02c54f739a7c7c035 (patch) | |
| tree | 2a7d490a37367cf95935a2bb7b8dd3cc1a778737 /sbin/newfs | |
| parent | 4e78ff7068e13cb32b4165fe362f8ddf81160031 (diff) | |
| download | src-1e2b9afca9212aa3d6f9cfc02c54f739a7c7c035.tar.gz src-1e2b9afca9212aa3d6f9cfc02c54f739a7c7c035.zip | |
Prefix UFS symbols with UFS_ to reduce namespace pollution
Followup to r313780. Also prefix ext2's and nandfs's versions with
EXT2_ and NANDFS_.
Reported by: kib
Reviewed by: kib, mckusick
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D9623
Notes
Notes:
svn path=/head/; revision=331083
Diffstat (limited to 'sbin/newfs')
| -rw-r--r-- | sbin/newfs/mkfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 79fc627e5f7a..b4e49c29b8b5 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -883,7 +883,7 @@ fsinit(time_t utime) /* * create the root directory */ - node.dp1.di_mode = IFDIR | UMASK; + node.dp1.di_mode = UFS_IFDIR | UMASK; node.dp1.di_nlink = entries; node.dp1.di_size = makedir(root_dir, entries); node.dp1.di_db[0] = alloc(sblock.fs_fsize, node.dp1.di_mode); @@ -919,7 +919,7 @@ fsinit(time_t utime) /* * create the root directory */ - node.dp2.di_mode = IFDIR | UMASK; + node.dp2.di_mode = UFS_IFDIR | UMASK; node.dp2.di_nlink = entries; node.dp2.di_size = makedir(root_dir, entries); node.dp2.di_db[0] = alloc(sblock.fs_fsize, node.dp2.di_mode); @@ -1002,7 +1002,7 @@ goth: acg.cg_cs.cs_nbfree--; sblock.fs_cstotal.cs_nbfree--; fscs[0].cs_nbfree--; - if (mode & IFDIR) { + if (mode & UFS_IFDIR) { acg.cg_cs.cs_ndir++; sblock.fs_cstotal.cs_ndir++; fscs[0].cs_ndir++; |