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/fsck_ffs/inode.c | |
| parent | 4e78ff7068e13cb32b4165fe362f8ddf81160031 (diff) | |
| download | src-test2-1e2b9afca9212aa3d6f9cfc02c54f739a7c7c035.tar.gz src-test2-1e2b9afca9212aa3d6f9cfc02c54f739a7c7c035.zip | |
Notes
Diffstat (limited to 'sbin/fsck_ffs/inode.c')
| -rw-r--r-- | sbin/fsck_ffs/inode.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index e40527770a69..2e4651ed0f89 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -71,8 +71,8 @@ ckinode(union dinode *dp, struct inodesc *idesc) idesc->id_lbn = -1; idesc->id_entryno = 0; idesc->id_filesize = DIP(dp, di_size); - mode = DIP(dp, di_mode) & IFMT; - if (mode == IFBLK || mode == IFCHR || (mode == IFLNK && + mode = DIP(dp, di_mode) & UFS_IFMT; + if (mode == UFS_IFBLK || mode == UFS_IFCHR || (mode == UFS_IFLNK && DIP(dp, di_size) < (unsigned)sblock.fs_maxsymlinklen)) return (KEEPON); if (sblock.fs_magic == FS_UFS1_MAGIC) @@ -347,7 +347,7 @@ getnextinode(ino_t inumber, int rebuildcg) * Try to determine if we have reached the end of the * allocated inodes. */ - mode = DIP(dp, di_mode) & IFMT; + mode = DIP(dp, di_mode) & UFS_IFMT; if (mode == 0) { if (memcmp(dp->dp2.di_db, ufs2_zino.di_db, UFS_NDADDR * sizeof(ufs2_daddr_t)) || @@ -362,9 +362,9 @@ getnextinode(ino_t inumber, int rebuildcg) ndb = howmany(DIP(dp, di_size), sblock.fs_bsize); if (ndb < 0) return (NULL); - if (mode == IFBLK || mode == IFCHR) + if (mode == UFS_IFBLK || mode == UFS_IFCHR) ndb++; - if (mode == IFLNK) { + if (mode == UFS_IFLNK) { /* * Fake ndb value so direct/indirect block checks below * will detect any garbage after symlink string. @@ -533,7 +533,7 @@ clri(struct inodesc *idesc, const char *type, int flag) dp = ginode(idesc->id_number); if (flag == 1) { pwarn("%s %s", type, - (DIP(dp, di_mode) & IFMT) == IFDIR ? "DIR" : "FILE"); + (DIP(dp, di_mode) & UFS_IFMT) == UFS_IFDIR ? "DIR":"FILE"); pinode(idesc->id_number); } if (preen || reply("CLEAR") == 1) { @@ -681,13 +681,13 @@ allocino(ino_t request, int type) return (0); setbit(cg_inosused(cgp), ino % sblock.fs_ipg); cgp->cg_cs.cs_nifree--; - switch (type & IFMT) { - case IFDIR: + switch (type & UFS_IFMT) { + case UFS_IFDIR: inoinfo(ino)->ino_state = DSTATE; cgp->cg_cs.cs_ndir++; break; - case IFREG: - case IFLNK: + case UFS_IFREG: + case UFS_IFLNK: inoinfo(ino)->ino_state = FSTATE; break; default: |