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 /usr.sbin | |
| parent | 4e78ff7068e13cb32b4165fe362f8ddf81160031 (diff) | |
Notes
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/quot/quot.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 348946ff7dbb..a30e6daa71a7 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -203,23 +203,24 @@ static int isfree(struct fs *super, union dinode *dp) { #ifdef COMPAT - return (DIP(super, dp, di_mode) & IFMT) == 0; + return (DIP(super, dp, di_mode) & UFS_IFMT) == 0; #else /* COMPAT */ - switch (DIP(super, dp, di_mode) & IFMT) { - case IFIFO: - case IFLNK: /* should check FASTSYMLINK? */ - case IFDIR: - case IFREG: + switch (DIP(super, dp, di_mode) & UFS_IFMT) { + case UFS_IFIFO: + case UFS_IFLNK: /* should check FASTSYMLINK? */ + case UFS_IFDIR: + case UFS_IFREG: return 0; - case IFCHR: - case IFBLK: - case IFSOCK: - case IFWHT: + case UFS_IFCHR: + case UFS_IFBLK: + case UFS_IFSOCK: + case UFS_IFWHT: case 0: return 1; default: - errx(1, "unknown IFMT 0%o", DIP(super, dp, di_mode) & IFMT); + errx(1, "unknown UFS_IFMT 0%o", + DIP(super, dp, di_mode) & UFS_IFMT); } #endif } @@ -389,8 +390,8 @@ dofsizes(int fd, struct fs *super, char *name) errno = 0; if ((dp = get_inode(fd,super,inode)) #ifdef COMPAT - && ((DIP(super, dp, di_mode) & IFMT) == IFREG - || (DIP(super, dp, di_mode) & IFMT) == IFDIR) + && ((DIP(super, dp, di_mode) & UFS_IFMT) == UFS_IFREG + || (DIP(super, dp, di_mode) & UFS_IFMT) == UFS_IFDIR) #else /* COMPAT */ && !isfree(super, dp) #endif /* COMPAT */ |