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 /stand/libsa | |
| 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 'stand/libsa')
| -rw-r--r-- | stand/libsa/nandfs.c | 4 | ||||
| -rw-r--r-- | stand/libsa/ufs.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/stand/libsa/nandfs.c b/stand/libsa/nandfs.c index b3dc255e1d28..b3e72243e995 100644 --- a/stand/libsa/nandfs.c +++ b/stand/libsa/nandfs.c @@ -654,7 +654,7 @@ nandfs_lookup_path(struct nandfs *fs, const char *path) while ((strp = strsep(&lpath, "/")) != NULL) { if (*strp == '\0') continue; - if ((node->inode->i_mode & NANDFS_IFMT) != NANDFS_IFDIR) { + if ((node->inode->i_mode & IFMT) != IFDIR) { nandfs_free_node(node); node = NULL; goto out; @@ -710,7 +710,7 @@ nandfs_lookup_path(struct nandfs *fs, const char *path) NANDFS_DEBUG("%s: %.*s has mode %o\n", __func__, dirent->name_len, dirent->name, node->inode->i_mode); - if ((node->inode->i_mode & NANDFS_IFMT) == NANDFS_IFLNK) { + if ((node->inode->i_mode & IFMT) == IFLNK) { NANDFS_DEBUG("%s: %.*s is symlink\n", __func__, dirent->name_len, dirent->name); link_len = node->inode->i_size; diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c index 60d13e0be4d8..2cad803e3c73 100644 --- a/stand/libsa/ufs.c +++ b/stand/libsa/ufs.c @@ -557,7 +557,7 @@ ufs_open(upath, f) /* * Check that current node is a directory. */ - if ((DIP(fp, di_mode) & UFS_IFMT) != UFS_IFDIR) { + if ((DIP(fp, di_mode) & IFMT) != IFDIR) { rc = ENOTDIR; goto out; } @@ -599,7 +599,7 @@ ufs_open(upath, f) /* * Check for symbolic link. */ - if ((DIP(fp, di_mode) & UFS_IFMT) == UFS_IFLNK) { + if ((DIP(fp, di_mode) & IFMT) == IFLNK) { int link_len = DIP(fp, di_size); int len; |