On Thu, Apr 01, 2021 at 07:36:10PM +0800, Hu Weiwen wrote: > Also added '--all-root' option to set uid and gid to root conveniently. > > This function can be useful if we want to pack some data owned by user with > large uid, but we want to use compact inode. > > This interface mimics that of 'mksquashfs'. > > Signed-off-by: Hu Weiwen <seh...@mail.scut.edu.cn>
Yey! I've applied with the following modification, diff --git a/include/erofs/config.h b/include/erofs/config.h index e6eaef66b91c..15390f4ca9c8 100644 --- a/include/erofs/config.h +++ b/include/erofs/config.h @@ -54,8 +54,7 @@ struct erofs_configure { /* < 0, xattr disabled and INT_MAX, always use inline xattrs */ int c_inline_xattr_tolerance; u64 c_unix_timestamp; - u32 c_uid; - u32 c_gid; + u32 c_uid, c_gid; #ifdef WITH_ANDROID char *mount_point; char *target_out_path; diff --git a/mkfs/main.c b/mkfs/main.c index 72b7f17e1c66..d8823b539194 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -77,8 +77,8 @@ static void usage(void) #ifdef HAVE_LIBSELINUX " --file-contexts=X specify a file contexts file to setup selinux labels\n" #endif - " --force-uid=UID set all file uids to UID\n" - " --force-gid=GID set all file gids to GID\n" + " --force-uid=# set all file uids to # (# = UID)\n" + " --force-gid=# set all file gids to # (# = GID)\n" " --all-root make all files owned by root\n" " --help display this help and exit\n" #ifdef WITH_ANDROID Otherwise looks good to me, Reviewed-by: Gao Xiang <xi...@kernel.org> Thanks, Gao Xiang