On 2014/12/18 16:09, Gui Hecheng wrote:
On Thu, 2014-12-18 at 15:42 +0900, Satoru Takeuchi wrote:
From: Satoru Takeuchi <[email protected]>
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 <[email protected]>
Reported-by: Naohiro Aota <[email protected]>
---
cmds-property.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/cmds-property.c b/cmds-property.c
index a4bc127..640af99 100644
--- a/cmds-property.c
+++ b/cmds-property.c
@@ -125,11 +125,22 @@ static int check_is_root(const char *object)
u8 fsid[BTRFS_FSID_SIZE];
u8 fsid2[BTRFS_FSID_SIZE];
char *tmp;
+ char *rp;
+
+ rp = realpath(object, NULL);
+ if (!rp) {
+ ret = -ENOMEM;
Hi Satoruļ¼
IMO, ret = -errno may be better, because there are many possible return
values of realpath().
Thank you for point my mistake out.
I'll dispose 1/2 and submit 2/2 vs later.
Thanks,
Satoru
Thanks,
Gui
+ goto out;
+ }
+ if (!strcmp(rp, "/")) {
+ ret = 0;
+ goto free_rp_out;
+ }
tmp = malloc(strlen(object) + 5);
if (!tmp) {
ret = -ENOMEM;
- goto out;
+ goto free_rp_out;
}
strcpy(tmp, object);
if (tmp[strlen(tmp) - 1] != '/')
@@ -165,6 +176,8 @@ static int check_is_root(const char *object)
free_tmp_out:
free(tmp);
+free_rp_out:
+ free(rp);
out:
return ret;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
