Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
This commit is contained in:
commit
536b930527
|
@ -1495,7 +1495,7 @@ zfs_do_upgrade(int argc, char **argv)
|
|||
boolean_t showversions = B_FALSE;
|
||||
int ret;
|
||||
upgrade_cbdata_t cb = { 0 };
|
||||
char c;
|
||||
signed char c;
|
||||
int flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
|
||||
|
||||
/* check options */
|
||||
|
@ -2251,7 +2251,7 @@ zfs_do_snapshot(int argc, char **argv)
|
|||
{
|
||||
boolean_t recursive = B_FALSE;
|
||||
int ret;
|
||||
char c;
|
||||
signed char c;
|
||||
nvlist_t *props;
|
||||
|
||||
if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) {
|
||||
|
|
Loading…
Reference in New Issue