Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2008-12-16 13:22:31 -08:00
parent b62b556896 5af8235e41
commit e4addd4618
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libzfs/libzfs_dataset.c
View File

@ -532,14 +532,14 @@ zfs_close(zfs_handle_t *zhp)
} }
int int
zfs_spa_version(zfs_handle_t *zhp, int *spa_version) zfs_spa_version(zfs_handle_t *zhp, int *version)
{ {
zpool_handle_t *zpool_handle = zhp->zpool_hdl; zpool_handle_t *zpool_handle = zhp->zpool_hdl;
if (zpool_handle == NULL) if (zpool_handle == NULL)
return (-1); return (-1);
*spa_version = zpool_get_prop_int(zpool_handle, *version = zpool_get_prop_int(zpool_handle,
ZPOOL_PROP_VERSION, NULL); ZPOOL_PROP_VERSION, NULL);
return (0); return (0);
} }
@ -550,12 +550,12 @@ zfs_spa_version(zfs_handle_t *zhp, int *spa_version)
static int static int
zfs_which_resv_prop(zfs_handle_t *zhp, zfs_prop_t *resv_prop) zfs_which_resv_prop(zfs_handle_t *zhp, zfs_prop_t *resv_prop)
{ {
int spa_version; int version;
if (zfs_spa_version(zhp, &spa_version) < 0) if (zfs_spa_version(zhp, &version) < 0)
return (-1); return (-1);
if (spa_version >= SPA_VERSION_REFRESERVATION) if (version >= SPA_VERSION_REFRESERVATION)
*resv_prop = ZFS_PROP_REFRESERVATION; *resv_prop = ZFS_PROP_REFRESERVATION;
else else
*resv_prop = ZFS_PROP_RESERVATION; *resv_prop = ZFS_PROP_RESERVATION;