On Thu, 2014-12-18 at 16:39 +0900, Satoru Takeuchi wrote: > From: Satoru Takeuchi <takeuchi_sat...@jp.fujitsu.com> > > When "/" is Btrfs, "btrfs property <subcommand> /" regards it > as non-root by mistake. > > check_is_root() regards @object as a file system root if > the following two conditions are satisfied. > > a) Both @object and its parent directory are Btrfs object > (file system root, subvolume, inode, and device > used for Btrfs). > b) fsid of the above mentioned two objects are different. > > It doesn't work if @object is "/" because, in this case, > fsid of "/" and its parent (it's also "/"), are the same. > > * Test environment > > Two Btrfs file system (not subvolume) "/" and "/home/sat/mnt". > > * How to reproduce > > Submit "btrfs prop get" against the above mentioned file systems. > > * Test Result > > ** Actual result (without my patch) > > ========================== > # btrfs prop get /home/sat/mnt/ > ro=false > label= # label is displayed because it's a file system root > # btrfs prop get / > ro=false # label is not displayed even if it's a file system > root > ========================== > ** Expected result (with my patch) > > ========================== > # ./btrfs-new prop get btrfs-auto-test/ > # ./btrfs-new prop get /home/sat/mnt/ > ro=false > label= > # ./btrfs-new prop get / > ro=false > label=foo # label is displayed > =========================== > > Signed-off-by: Satoru Takeuchi <takeuchi_sat...@jp.fujitsu.com> > Reported-by: Naohiro Aota <na...@elisp.net>
Looks good to me. Reviewed-by: Gui Hecheng <guihc.f...@cn.fujitsu.com> Thanks, Gui > --- > changelog > v2: Return a correct error code when realpath() fails. > Thank you Gui Hecheng for pointing my mistake out. > https://www.mail-archive.com/linux-btrfs@vger.kernel.org/msg40204.html > --- > cmds-property.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/cmds-property.c b/cmds-property.c > index a764293..6501338 100644 > --- a/cmds-property.c > +++ b/cmds-property.c > @@ -124,7 +124,18 @@ static int check_is_root(const char *object) > int ret; > u8 fsid[BTRFS_FSID_SIZE]; > u8 fsid2[BTRFS_FSID_SIZE]; > - char *tmp; > + char *tmp = NULL; > + char *rp; > + > + rp = realpath(object, NULL); > + if (!rp) { > + ret = -errno; > + goto out; > + } > + if (!strcmp(rp, "/")) { > + ret = 0; > + goto out; > + } > > tmp = malloc(strlen(object) + 5); > if (!tmp) { > @@ -165,6 +176,7 @@ static int check_is_root(const char *object) > > out: > free(tmp); > + free(rp); > return ret; > } > -- 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
