From: Anand Jain <anand.jain@xxxxxxxxxx>
btrfs f l /
No valid Btrfs found on /
Segmentation fault (core dumped)
open_ctree can return NULL, we need to check that.
Signed-off-by: Anand Jain <anand.jain@xxxxxxxxxx>
---
btrfslabel.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/btrfslabel.c b/btrfslabel.c
index bf73802..cb142b0 100644
--- a/btrfslabel.c
+++ b/btrfslabel.c
@@ -67,7 +67,7 @@ static void change_label_unmounted(char *dev, char *nLabel)
close_ctree(root);
}
-static void get_label_unmounted(char *dev)
+int get_label_unmounted(char *dev)
{
struct btrfs_root *root;
@@ -76,10 +76,14 @@ static void get_label_unmounted(char *dev)
*/
root = open_ctree(dev, 0, 0);
+ if(!root)
+ return -1;
+
fprintf(stdout, "%s\n", root->fs_info->super_copy.label);
/* Now we close it since we are done. */
close_ctree(root);
+ return 0;
}
int get_label(char *btrfs_dev)
@@ -98,8 +102,8 @@ int get_label(char *btrfs_dev)
fprintf(stderr, "FATAL: the filesystem has to be unmounted\n");
return -2;
}
- get_label_unmounted(btrfs_dev);
- return 0;
+ ret = get_label_unmounted(btrfs_dev);
+ return ret;
}
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
