*** 553,566 ****
  
          if ((req = dlmgmt_db_req_alloc(op, entryname, linkp->ll_linkid,
              linkp->ll_zoneid, flags, &err)) == NULL)
                  return (err);
  
-         /* If transient op and onloan, use the global zone cache file. */
-         if (flags == DLMGMT_ACTIVE && linkp->ll_onloan)
-                 req->ls_zoneid = GLOBAL_ZONEID;
- 
          /*
           * If the return error is EINPROGRESS, this request is handled
           * asynchronously; return success.
           */
          err = dlmgmt_process_db_req(req);
--- 553,562 ----
*** 725,739 ****
  
          curr = buf;
          len = strlen(buf);
          attr_name[0] = '\0';
          for (i = 0; i < len; i++) {
-                 rename = B_FALSE;
                  char            c = buf[i];
                  boolean_t       match = (c == '=' ||
                      (c == ',' && !found_type) || c == ';');
  
                  /*
                   * Move to the next character if there is no match and
                   * if we have not reached the last character.
                   */
                  if (!match && i != len - 1)
--- 721,735 ----
  
          curr = buf;
          len = strlen(buf);
          attr_name[0] = '\0';
          for (i = 0; i < len; i++) {
                  char            c = buf[i];
                  boolean_t       match = (c == '=' ||
                      (c == ',' && !found_type) || c == ';');
  
+                 rename = B_FALSE;
                  /*
                   * Move to the next character if there is no match and
                   * if we have not reached the last character.
                   */
                  if (!match && i != len - 1)
*** 1497,1512 ****
                  }
          } else {
                  boot = B_TRUE;
          }
  
-         if (zone_file_exists(zoneroot, DLMGMT_PERSISTENT_DB_PATH)) {
                  req->ls_flags = DLMGMT_PERSIST;
                  err = dlmgmt_process_db_req(req);
                  if (err != 0 && err != ENOENT)
                          goto done;
-         }
          err = 0;
          if (rewrite_needed) {
                  /*
                   * First update links in memory, then dump the entire db to
                   * disk.
--- 1493,1506 ----
*** 1560,1570 ****
                                  linkp->ll_tomb = B_TRUE;
                          } else {
                                  (void) dlmgmt_destroy_common(linkp,
                                      DLMGMT_ACTIVE | DLMGMT_PERSIST);
                          }
- 
                  }
                  linkp = next_linkp;
          }
  
  again:
--- 1554,1563 ----