Print this page
patch first-pass

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/zfs/dsl_dir.c
          +++ new/usr/src/uts/common/fs/zfs/dsl_dir.c
↓ open down ↓ 227 lines elided ↑ open up ↑
 228  228                              dsl_dir_phys(dd)->dd_origin_obj, FTAG,
 229  229                              &origin_bonus);
 230  230                          if (err != 0)
 231  231                                  goto errout;
 232  232                          origin_phys = origin_bonus->db_data;
 233  233                          dd->dd_origin_txg =
 234  234                              origin_phys->ds_creation_txg;
 235  235                          dmu_buf_rele(origin_bonus, FTAG);
 236  236                  }
 237  237  
 238      -                dmu_buf_init_user(&dd->dd_dbu, dsl_dir_evict, &dd->dd_dbuf);
      238 +                dmu_buf_init_user(&dd->dd_dbu, NULL, dsl_dir_evict,
      239 +                    &dd->dd_dbuf);
 239  240                  winner = dmu_buf_set_user_ie(dbuf, &dd->dd_dbu);
 240  241                  if (winner != NULL) {
 241  242                          if (dd->dd_parent)
 242  243                                  dsl_dir_rele(dd->dd_parent, dd);
 243  244                          dsl_prop_fini(dd);
 244  245                          mutex_destroy(&dd->dd_lock);
 245  246                          kmem_free(dd, sizeof (dsl_dir_t));
 246  247                          dd = winner;
 247  248                  } else {
 248  249                          spa_open_ref(dp->dp_spa, dd);
↓ open down ↓ 1734 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX