[PATCH] erofs-utils: fix mkfs flush inode i_u

Hu Weiwen sehuww at mail.scut.edu.cn
Sun Jan 31 20:45:25 AEDT 2021


When choosing which field of i_u to use, it should be `inode->i_mode & S_IFMT'

Previously, the default branch is always taken. Fortunately, all 3 field has
the same data type, and they are in the same union, so it happens to work.

Signed-off-by: Hu Weiwen <sehuww at mail.scut.edu.cn>
---
 lib/inode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/inode.c b/lib/inode.c
index 73a7e69..0ed4264 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -412,7 +412,7 @@ static bool erofs_bh_flush_write_inode(struct erofs_buffer_head *bh)
 		u.dic.i_uid = cpu_to_le16((u16)inode->i_uid);
 		u.dic.i_gid = cpu_to_le16((u16)inode->i_gid);
 
-		switch ((inode->i_mode) >> S_SHIFT) {
+		switch (inode->i_mode & S_IFMT) {
 		case S_IFCHR:
 		case S_IFBLK:
 		case S_IFIFO:
@@ -445,7 +445,7 @@ static bool erofs_bh_flush_write_inode(struct erofs_buffer_head *bh)
 		u.die.i_ctime = cpu_to_le64(inode->i_ctime);
 		u.die.i_ctime_nsec = cpu_to_le32(inode->i_ctime_nsec);
 
-		switch ((inode->i_mode) >> S_SHIFT) {
+		switch (inode->i_mode & S_IFMT) {
 		case S_IFCHR:
 		case S_IFBLK:
 		case S_IFIFO:
-- 
2.25.1



More information about the Linux-erofs mailing list