From: Qu Wenruo Date: Mon, 4 Sep 2017 03:43:19 +0000 (+0900) Subject: btrfs-progs: mkfs: Fix wrong file type for dir items and indexes when specifying... X-Git-Tag: upstream/4.16.1~436 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=081e4e9bb83283a7fa38c13da589e103f01e5f7d;p=platform%2Fupstream%2Fbtrfs-progs.git btrfs-progs: mkfs: Fix wrong file type for dir items and indexes when specifying root directory [Bug] If using mkfs.btrfs with "-r" parameter and specified directory has fifo/socket/char/block special file, then created filesystem 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 directories, regular files and symlink, 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 Signed-off-by: David Sterba --- diff --git a/mkfs/main.c b/mkfs/main.c index f495258..7592c1f 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -436,6 +436,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,