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 2009-05-22 16:38:07 -07:00
parent 14ca042c97 9c53917bd5
commit 58a80b1cd3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zfs/zfs_main.c
View File

@ -1495,7 +1495,7 @@ zfs_do_upgrade(int argc, char **argv)
boolean_t showversions = B_FALSE; boolean_t showversions = B_FALSE;
int ret; int ret;
upgrade_cbdata_t cb = { 0 }; upgrade_cbdata_t cb = { 0 };
char c; signed char c;
int flags = ZFS_ITER_ARGS_CAN_BE_PATHS; int flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
/* check options */ /* check options */
@ -2251,7 +2251,7 @@ zfs_do_snapshot(int argc, char **argv)
{ {
boolean_t recursive = B_FALSE; boolean_t recursive = B_FALSE;
int ret; int ret;
char c; signed char c;
nvlist_t *props; nvlist_t *props;
if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) { if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) {