d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbe(3): Use zfs_is_mounted to check mounted and mountpoint

Browse Source
This commit is contained in:
kevans 2018-07-25 15:45:42 +00:00
parent fa415c9fee
commit 823f2e5ae8
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libbe/be_info.c
View File

@ -114,7 +114,7 @@ be_get_bootenv_props(libbe_handle_t *lbh, nvlist_t *dsnvl)
static int
prop_list_builder_cb(zfs_handle_t *zfs_hdl, void *data_p)
{
char buf[512];
char buf[512], *mountpoint;
prop_data_t *data;
libbe_handle_t *lbh;
nvlist_t *props;
@ -137,15 +137,11 @@ prop_list_builder_cb(zfs_handle_t *zfs_hdl, void *data_p)
name = strrchr(dataset, '/') + 1;
nvlist_add_string(props, "name", name);
mounted = zfs_prop_get_int(zfs_hdl, ZFS_PROP_MOUNTED);
mounted = zfs_is_mounted(zfs_hdl, &mountpoint);
nvlist_add_boolean_value(props, "mounted", mounted);
/* XXX TODO: NOT CORRECT! Must use is_mounted */
if (mounted) {
zfs_prop_get(zfs_hdl, ZFS_PROP_MOUNTPOINT, buf, 512,
NULL, NULL, 0, 1);
nvlist_add_string(props, "mountpoint", buf);
}
if (mounted)
nvlist_add_string(props, "mountpoint", mountpoint);
if (zfs_prop_get(zfs_hdl, ZFS_PROP_ORIGIN, buf, 512,
NULL, NULL, 0, 1))