summaryrefslogtreecommitdiff
path: root/e2fsck/pass3.c
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2015-10-24 00:43:19 -0400
committerTheodore Ts'o <tytso@mit.edu>2015-10-24 00:44:40 -0400
commit86f3b6cf98a72c6dad0738e3af2512ddcbd49be9 (patch)
treea5303cf9329ff6022a055d42d3b06d39e9850735 /e2fsck/pass3.c
parent77b3e9871877fce9908b0696250787fd6ea61af9 (diff)
downloade2fsprogs-86f3b6cf98a72c6dad0738e3af2512ddcbd49be9.tar.gz
e2fsck: clean up feature test macros with predicate functions
Create separate predicate functions to test/set/clear feature flags, thereby replacing the wordy old macros. Furthermore, clean out the places where we open-coded feature tests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'e2fsck/pass3.c')
-rw-r--r--e2fsck/pass3.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c
index d7b88029..3b076c40 100644
--- a/e2fsck/pass3.c
+++ b/e2fsck/pass3.c
@@ -716,8 +716,7 @@ static int fix_dotdot_proc(struct ext2_dir_entry *dirent,
fix_problem(fp->ctx, PR_3_ADJUST_INODE, &pctx);
}
dirent->inode = fp->parent;
- if (fp->ctx->fs->super->s_feature_incompat &
- EXT2_FEATURE_INCOMPAT_FILETYPE)
+ if (ext2fs_has_feature_filetype(fp->ctx->fs->super))
ext2fs_dirent_set_file_type(dirent, EXT2_FT_DIR);
else
ext2fs_dirent_set_file_type(dirent, EXT2_FT_UNKNOWN);