diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-04-21 12:20:05 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-04-21 12:20:05 +0000 |
| commit | 3eacfc2b49fb2e87d561b8204560f9464c0a18cb (patch) | |
| tree | 01047ff5c7170d1af406588e3bc0a933fdc591b5 /usr/src/lib/libzfs/common/libzfs_dataset.c | |
| parent | a3ff90a8ed2ff994c15b0dca337baf1814d00b38 (diff) | |
| parent | 20fea7a47472aceb64d3ed48cc2a3ea268bc4795 (diff) | |
| download | illumos-joyent-3eacfc2b49fb2e87d561b8204560f9464c0a18cb.tar.gz | |
[illumos-gate merge]
commit 20fea7a47472aceb64d3ed48cc2a3ea268bc4795
6879 incorrect endianness swap for drr_spill.drr_length in libzfs_sendrecv.c
commit c5d1600c3eb0a58e493be9019c5fb8eaec72cb81
6880 zdb incorrectly reports feature count mismatch when feature is disabled
commit 88a916040716032880a2a28e8f26912aef5426da
6877 zfs_rename_006_pos fails due to missing zvol snapshot device file
commit 8fc922875ed266f52ccd5cc6f973b9ad0839c710
6871 libzpool implementation of thread_create should enforce length is 0
commit f83b46baf98d276f5f84fa84c8b461f412ac1f5e
6872 zfs libraries should not allow uninitialized variables
commit 80309ff2cfc900b5f6acfe1d7f72cf67baf81fbe
6870 Update zoneinfo to 2016c (zone_sun.tab mismerge)
commit 232f5a2e6e6fcc0e7d4f5bd719cd5e6433a24020
6875 fix zfs-tests ACL cases
commit da412744bc6f902e4519ae67e92191a2e5d85e2c
6765 zfs_zaccess_delete() comments do not accurately reflect delete permissions for ACLs
commit de0f1ddb598506a5d9a02946b67e9300b5f2a7cd
6764 zfs issues with inheritance flags during chmod(2) with aclmode=passthrough
commit 851632d6a88d512574719953cc01ae7c2ed66b88
6763 aclinherit=restricted masks inherited permissions by group perms (groupmask)
commit 1eb4e906ec75b9bde421954ace46ef137b0fc9eb
6762 POSIX write should imply DELETE_CHILD on directories - and some additional considerations
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_dataset.c')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_dataset.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c index 77db126b5b..a31f203315 100644 --- a/usr/src/lib/libzfs/common/libzfs_dataset.c +++ b/usr/src/lib/libzfs/common/libzfs_dataset.c @@ -1550,7 +1550,7 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvlist_t *props) libzfs_handle_t *hdl = zhp->zfs_hdl; nvlist_t *nvl; int nvl_len; - int added_resv; + int added_resv = 0; (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN, "cannot set property for '%s'"), @@ -3160,7 +3160,7 @@ zfs_create_ancestors(libzfs_handle_t *hdl, const char *path) { int prefix; char *path_copy; - int rc; + int rc = 0; if (check_parents(hdl, path, NULL, B_TRUE, &prefix) != 0) return (-1); @@ -3799,7 +3799,7 @@ zfs_rollback(zfs_handle_t *zhp, zfs_handle_t *snap, boolean_t force) rollback_data_t cb = { 0 }; int err; boolean_t restore_resv = 0; - uint64_t old_volsize, new_volsize; + uint64_t old_volsize = 0, new_volsize; zfs_prop_t resv_prop; assert(zhp->zfs_type == ZFS_TYPE_FILESYSTEM || @@ -3988,6 +3988,7 @@ zfs_rename(zfs_handle_t *zhp, const char *target, boolean_t recursive, "child dataset with inherited mountpoint is used " "in a non-global zone")); (void) zfs_error(hdl, EZFS_ZONED, errbuf); + ret = -1; goto error; } |