Merge branch 'dev-zfs-0.7.x'

2019-06-20 21:28:44 +02:00
parent 29b1f8314d 3805d8a4c1
commit 8bf9664c9c
2 changed files with 6 additions and 8 deletions
@@ -32,13 +32,11 @@ property_list_t *new_property_list() {
 }

 void free_properties(property_list_t *root) {
-	if (root != 0) {
 	property_list_t *tmp = 0;
-		do {
+	while(root) {
 		tmp = root->pnext;
 		free(root);
 		root = tmp;
-		} while(tmp);
 	}
 }

@@ -241,7 +241,7 @@ func (d *Dataset) SendSize(FromName string, flags SendFlags) (size int64, err er
 		errch <- tmpe
 	}()

-	r.SetReadDeadline(time.Now().Add(15 * time.Second))
+	r.SetReadDeadline(time.Now().Add(60 * time.Second))
 	var data []byte
 	if data, err = ioutil.ReadAll(r); err != nil {
 		return