From cf22644a0e5f1a66c61e90da15784effe3ba7ced Mon Sep 17 00:00:00 2001 From: Martin Brandenburg Date: Fri, 5 Feb 2016 16:37:00 -0500 Subject: [PATCH] orangefs: use S_ISREG(mode) and friends instead of mode & S_IFREG. Suggestion from Dan Carpenter. Signed-off-by: Martin Brandenburg Signed-off-by: Mike Marshall --- fs/orangefs/orangefs-utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/orangefs/orangefs-utils.c b/fs/orangefs/orangefs-utils.c index 08f9c2dab0fe..63e8c9bc912e 100644 --- a/fs/orangefs/orangefs-utils.c +++ b/fs/orangefs/orangefs-utils.c @@ -428,17 +428,17 @@ static int compare_attributes_to_inode(struct inode *inode, switch (attrs->objtype) { case ORANGEFS_TYPE_METAFILE: - if (!(inode->i_mode & S_IFREG)) + if (!S_ISREG(inode->i_mode)) return 0; break; case ORANGEFS_TYPE_DIRECTORY: - if (!(inode->i_mode & S_IFDIR)) + if (!S_ISDIR(inode->i_mode)) return 0; if (inode->i_nlink != 1) return 0; break; case ORANGEFS_TYPE_SYMLINK: - if (!(inode->i_mode & S_IFLNK)) + if (!S_ISLNK(inode->i_mode)) return 0; if (orangefs_inode && symname && mask & ORANGEFS_ATTR_SYS_LNK_TARGET) -- 2.20.1