@@ -32,17 +32,24 @@ static int read_inode(struct inode *inode, void *data)
vi->xattr_isize = erofs_xattr_ibody_size(v2->i_xattr_icount);
inode->i_mode = le16_to_cpu(v2->i_mode);
- if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
- S_ISLNK(inode->i_mode))
+ switch (inode->i_mode & S_IFMT) {
+ case S_IFREG:
+ case S_IFDIR:
+ case S_IFLNK:
vi->raw_blkaddr = le32_to_cpu(v2->i_u.raw_blkaddr);
- else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
+ break;
+ case S_IFCHR:
+ case S_IFBLK:
inode->i_rdev =
new_decode_dev(le32_to_cpu(v2->i_u.rdev));
- else if (S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode))
+ break;
+ case S_IFIFO:
+ case S_IFSOCK:
inode->i_rdev = 0;
- else
+ break;
+ default:
goto bogusimode;
-
+ }
i_uid_write(inode, le32_to_cpu(v2->i_uid));
i_gid_write(inode, le32_to_cpu(v2->i_gid));
set_nlink(inode, le32_to_cpu(v2->i_nlink));
@@ -65,17 +72,24 @@ static int read_inode(struct inode *inode, void *data)
vi->xattr_isize = erofs_xattr_ibody_size(v1->i_xattr_icount);
inode->i_mode = le16_to_cpu(v1->i_mode);
- if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
- S_ISLNK(inode->i_mode))
+ switch (inode->i_mode & S_IFMT) {
+ case S_IFREG:
+ case S_IFDIR:
+ case S_IFLNK:
vi->raw_blkaddr = le32_to_cpu(v1->i_u.raw_blkaddr);
- else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
+ break;
+ case S_IFCHR:
+ case S_IFBLK:
inode->i_rdev =
new_decode_dev(le32_to_cpu(v1->i_u.rdev));
- else if (S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode))
+ break;
+ case S_IFIFO:
+ case S_IFSOCK:
inode->i_rdev = 0;
- else
+ break;
+ default:
goto bogusimode;
-
+ }
i_uid_write(inode, le16_to_cpu(v1->i_uid));
i_gid_write(inode, le16_to_cpu(v1->i_gid));
set_nlink(inode, le16_to_cpu(v1->i_nlink));