Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
f96e126112
|
@ -229,7 +229,7 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf, size_t len,
|
||||||
|
|
||||||
case ZPOOL_PROP_GUID:
|
case ZPOOL_PROP_GUID:
|
||||||
intval = zpool_get_prop_int(zhp, prop, &src);
|
intval = zpool_get_prop_int(zhp, prop, &src);
|
||||||
(void) snprintf(buf, len, "%llu", intval);
|
(void) snprintf(buf, len, "%llu", (u_longlong_t)intval);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ZPOOL_PROP_ALTROOT:
|
case ZPOOL_PROP_ALTROOT:
|
||||||
|
|
Loading…
Reference in New Issue