[Bug]
If using mkfs.btrfs with "-r" parameter and specified direct has
fifo/socket/char/block special file, then created btrfs can't pass fsck:

------
checking fs roots
        unresolved ref dir 241158 index 3 namelen 9 name S.dirmngr filetype 0 
errors 80, filetype mismatch
ERROR: errors found in fs roots
------

[Reason]
Btrfs dir items/indexes records inode type, while "-r" only handles
directors, regular files and soft link, it makes such special files type
to be regular file and caused the problem.

[Fix]
Add missing types for add_directory_items(), so that result of
"mkfs.btrfs -r" can pass mkfs.

Signed-off-by: Qu Wenruo <quwenruo.bt...@gmx.com>
---
 mkfs/main.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mkfs/main.c b/mkfs/main.c
index afd68bc5..84ff300b 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -435,6 +435,14 @@ static int add_directory_items(struct btrfs_trans_handle 
*trans,
                filetype = BTRFS_FT_REG_FILE;
        if (S_ISLNK(st->st_mode))
                filetype = BTRFS_FT_SYMLINK;
+       if (S_ISSOCK(st->st_mode))
+               filetype = BTRFS_FT_SOCK;
+       if (S_ISCHR(st->st_mode))
+               filetype = BTRFS_FT_CHRDEV;
+       if (S_ISBLK(st->st_mode))
+               filetype = BTRFS_FT_BLKDEV;
+       if (S_ISFIFO(st->st_mode))
+               filetype = BTRFS_FT_FIFO;
 
        ret = btrfs_insert_dir_item(trans, root, name, name_len,
                                    parent_inum, &location,
-- 
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to