diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2018-03-17 12:59:55 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2018-03-17 12:59:55 +0000 |
| commit | d8ba45e21358ccd9c50991e62cf863bc19699756 (patch) | |
| tree | 45c6abbd5a9b767ea88e1ebc76e9d804b6a87cd7 /sbin/fsdb/fsdb.c | |
| parent | 7651c3af83d9d83f9b6f18bb55eba52fe1657e55 (diff) | |
| download | src-d8ba45e21358ccd9c50991e62cf863bc19699756.tar.gz src-d8ba45e21358ccd9c50991e62cf863bc19699756.zip | |
Revert r313780 (UFS_ prefix)
Notes
Notes:
svn path=/head/; revision=331095
Diffstat (limited to 'sbin/fsdb/fsdb.c')
| -rw-r--r-- | sbin/fsdb/fsdb.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c index 8f1598c1e8ab..1c6f78302fce 100644 --- a/sbin/fsdb/fsdb.c +++ b/sbin/fsdb/fsdb.c @@ -512,14 +512,14 @@ CMDFUNCSTART(findblk) /* Get on-disk inode aka dinode. */ curinum = inum; curinode = ginode(inum); - /* Find UFS_IFLNK dinode with allocated data blocks. */ - switch (DIP(curinode, di_mode) & UFS_IFMT) { - case UFS_IFDIR: - case UFS_IFREG: + /* Find IFLNK dinode with allocated data blocks. */ + switch (DIP(curinode, di_mode) & IFMT) { + case IFDIR: + case IFREG: if (DIP(curinode, di_blocks) == 0) continue; break; - case UFS_IFLNK: + case IFLNK: { uint64_t size = DIP(curinode, di_size); if (size > 0 && size < sblock.fs_maxsymlinklen && @@ -889,10 +889,10 @@ struct typemap { const char *typename; int typebits; } typenamemap[] = { - {"file", UFS_IFREG}, - {"dir", UFS_IFDIR}, - {"socket", UFS_IFSOCK}, - {"fifo", UFS_IFIFO}, + {"file", IFREG}, + {"dir", IFDIR}, + {"socket", IFSOCK}, + {"fifo", IFIFO}, }; CMDFUNCSTART(newtype) @@ -902,7 +902,7 @@ CMDFUNCSTART(newtype) if (!checkactive()) return 1; - type = DIP(curinode, di_mode) & UFS_IFMT; + type = DIP(curinode, di_mode) & IFMT; for (tp = typenamemap; tp < &typenamemap[nitems(typenamemap)]; tp++) { @@ -917,7 +917,7 @@ CMDFUNCSTART(newtype) warnx("try one of `file', `dir', `socket', `fifo'"); return 1; } - DIP_SET(curinode, di_mode, DIP(curinode, di_mode) & ~UFS_IFMT); + DIP_SET(curinode, di_mode, DIP(curinode, di_mode) & ~IFMT); DIP_SET(curinode, di_mode, DIP(curinode, di_mode) | type); inodirty(); printactive(0); |