From: Gao Xiang <hsiangkao@redhat.com>
To: Yue Hu <zbestahu@gmail.com>
Cc: xiang@kernel.org, linux-erofs@lists.ozlabs.org, huyue2@yulong.com
Subject: Re: [PATCH] AOSP: erofs-utils: fix sub directory prefix path in canned fs_config
Date: Tue, 22 Dec 2020 17:39:52 +0800 [thread overview]
Message-ID: <20201222093952.GC1819755@xiangao.remote.csb> (raw)
In-Reply-To: <20201222173014.000055d3.zbestahu@gmail.com>
On Tue, Dec 22, 2020 at 05:30:14PM +0800, Yue Hu wrote:
...
> > >
> > >
> > > > + else if (asprintf(&fspath, "%s/%s", cfg.mount_point,
> > > > + erofs_fspath(path)) <= 0)
> > >
> > > The argument of path will be root directory. And canned fs_config for root directory as
> > > below:
> > >
> > > 0 0 755 selabel=u:object_r:rootfs:s0 capabilities=0x0
> > >
> > > So, cannot add mount point to root directory for canned fs_config. And what about non-canned
> > > fs_config?
> >
> > Not quite sure what you mean. For non-canned fs_config, we didn't observed any strange
> > before (I ported to cuttlefish and hikey960 with boot success, also as I mentioned before
> > some other vendors already use it.)
> >
> > I think the following commit is only useful for squashfs since its (non)root inode
> > workflows are different, so need to add in two difference place. But mkfs.erofs is not.
> > https://android.googlesource.com/platform/external/squashfs-tools/+/85a6bc1e52bb911f195c5dc0890717913938c2d1%5E%21/#F0
> >
> > For root inode is erofs, I think erofs_fspath(path) would return "", so that case
> > is included as well.... Am I missing something?
>
> Yes, erofs_fspath(path) returns "" for root inode. However, the above patch add the mount
> point to fspath when specify it, so the real path is "vendor/" which does not exist in canned
> fs_config file. build will report below error:
>
> failed to find [/vendor/] in canned fs_config
Hmmm... such design is quite strange for me....
Could you try the following diff?
diff --git a/lib/inode.c b/lib/inode.c
index 9469074..9af6179 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -698,11 +698,14 @@ int erofs_droid_inode_fsconfig(struct erofs_inode *inode,
/* filesystem_config does not preserve file type bits */
mode_t stat_file_type_mask = st->st_mode & S_IFMT;
unsigned int uid = 0, gid = 0, mode = 0;
+ bool alloced;
char *fspath;
inode->capabilities = 0;
- if (!cfg.mount_point)
- fspath = erofs_fspath(path);
+
+ alloced = (cfg.mount_point && erofs_fspath(path)[0] != '\0');
+ if (!alloced)
+ fspath = (char *)erofs_fspath(path);
else if (asprintf(&fspath, "%s/%s", cfg.mount_point,
erofs_fspath(path)) <= 0)
return -ENOMEM;
@@ -718,7 +721,7 @@ int erofs_droid_inode_fsconfig(struct erofs_inode *inode,
cfg.target_out_path,
&uid, &gid, &mode, &inode->capabilities);
- if (cfg.mount_point)
+ if (alloced)
free(fspath);
st->st_uid = uid;
st->st_gid = gid;
if it works, will redo a formal patch then....
Thanks,
Gao Xiang
>
> >
> > Thanks,
> > Gao Xiang
> >
> > >
> > > Thx.
> > >
> > >
> > > > + return -ENOMEM;
> > > > +
> > > > +
> > > > if (cfg.fs_config_file)
> > > > - canned_fs_config(erofs_fspath(path),
> > > > + canned_fs_config(fspath,
> > > > S_ISDIR(st->st_mode),
> > > > cfg.target_out_path,
> > > > &uid, &gid, &mode, &inode->capabilities);
> > > > - else if (cfg.mount_point) {
> > > > - if (asprintf(&fspath, "%s/%s", cfg.mount_point,
> > > > - erofs_fspath(path)) <= 0)
> > > > - return -ENOMEM;
> > > > -
> > > > + else
> > > > fs_config(fspath, S_ISDIR(st->st_mode),
> > > > cfg.target_out_path,
> > > > &uid, &gid, &mode, &inode->capabilities);
> > > > +
> > > > + if (cfg.mount_point)
> > > > free(fspath);
> > > > - }
> > > > st->st_uid = uid;
> > > > st->st_gid = gid;
> > > > st->st_mode = mode | stat_file_type_mask;
> > >
> >
>
next prev parent reply other threads:[~2020-12-22 9:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-22 2:04 [PATCH] AOSP: erofs-utils: fix sub directory prefix path in canned fs_config Yue Hu
2020-12-22 3:44 ` Gao Xiang
2020-12-22 4:47 ` Yue Hu
2020-12-22 6:31 ` Gao Xiang
2020-12-22 7:04 ` Gao Xiang
2020-12-22 7:12 ` Yue Hu
2020-12-22 8:10 ` Yue Hu
2020-12-22 9:13 ` Gao Xiang
2020-12-22 9:27 ` Gao Xiang
2020-12-22 9:30 ` Yue Hu
2020-12-22 9:39 ` Gao Xiang [this message]
2020-12-22 9:46 ` Yue Hu
2020-12-22 9:59 ` Gao Xiang
2020-12-22 10:17 ` Yue Hu
2020-12-22 10:33 ` Gao Xiang
2020-12-22 11:07 ` Yue Hu
2020-12-22 10:34 ` Yue Hu
2020-12-22 10:47 ` Gao Xiang
2020-12-24 3:45 ` Yue Hu
2020-12-24 4:19 ` Gao Xiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201222093952.GC1819755@xiangao.remote.csb \
--to=hsiangkao@redhat.com \
--cc=huyue2@yulong.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=xiang@kernel.org \
--cc=zbestahu@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).