From: Gao Xiang <[email protected]> Special file was already supported by obsoleted_mkfs, let's complete it for new erofs-utils now.
Signed-off-by: Gao Xiang <[email protected]> --- Hi Guifu, Could you kindly take a look of these patches? Thanks, Gao Xiang configure.ac | 1 + lib/inode.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index fcdf30a..07e034e 100644 --- a/configure.ac +++ b/configure.ac @@ -82,6 +82,7 @@ AC_CHECK_HEADERS(m4_flatten([ string.h sys/ioctl.h sys/stat.h + sys/sysmacros.h sys/time.h unistd.h ])) diff --git a/lib/inode.c b/lib/inode.c index e3495f4..c8cf847 100644 --- a/lib/inode.c +++ b/lib/inode.c @@ -12,6 +12,7 @@ #include <stdlib.h> #include <stdio.h> #include <sys/stat.h> +#include <sys/sysmacros.h> #include <dirent.h> #include "erofs/print.h" #include "erofs/inode.h" @@ -128,7 +129,6 @@ static int __allocate_inode_bh_data(struct erofs_inode *inode, int ret; if (!nblocks) { - inode->bh_data = NULL; /* it has only tail-end inlined data */ inode->u.i_blkaddr = NULL_ADDR; return 0; @@ -302,6 +302,11 @@ int erofs_write_file(struct erofs_inode *inode) unsigned int nblocks, i; int ret, fd; + if (!inode->i_size) { + inode->data_mapping_mode = EROFS_INODE_FLAT_PLAIN; + return 0; + } + if (cfg.c_compr_alg_master && erofs_file_is_compressible(inode)) { ret = erofs_write_compressed_file(inode); @@ -573,6 +578,14 @@ out: return 0; } +static u32 erofs_new_encode_dev(dev_t dev) +{ + const unsigned int major = major(dev); + const unsigned int minor = minor(dev); + + return (minor & 0xff) | (major << 8) | ((minor & ~0xff) << 12); +} + int erofs_fill_inode(struct erofs_inode *inode, struct stat64 *st, const char *path) @@ -582,10 +595,22 @@ int erofs_fill_inode(struct erofs_inode *inode, inode->i_gid = st->st_gid; inode->i_nlink = 1; /* fix up later if needed */ - if (!S_ISDIR(inode->i_mode)) - inode->i_size = st->st_size; - else + switch (inode->i_mode & S_IFMT) { + case S_IFCHR: + case S_IFBLK: + case S_IFIFO: + case S_IFSOCK: + inode->u.i_rdev = erofs_new_encode_dev(st->st_rdev); + case S_IFDIR: inode->i_size = 0; + break; + case S_IFREG: + case S_IFLNK: + inode->i_size = st->st_size; + break; + default: + return -EINVAL; + } strncpy(inode->i_srcpath, path, sizeof(inode->i_srcpath) - 1); inode->i_srcpath[sizeof(inode->i_srcpath) - 1] = '\0'; @@ -613,6 +638,7 @@ struct erofs_inode *erofs_new_inode(void) inode->i_count = 1; init_list_head(&inode->i_subdirs); + inode->idata_size = 0; inode->xattr_isize = 0; inode->extent_isize = 0; -- 2.17.1
