Print this page
patch tsoome-feedback

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libzfs/common/libzfs_config.c
          +++ new/usr/src/lib/libzfs/common/libzfs_config.c
↓ open down ↓ 310 lines elided ↑ open up ↑
 311  311          zhp->zpool_config_size = zc.zc_nvlist_dst_size;
 312  312  
 313  313          if (zhp->zpool_config != NULL) {
 314  314                  uint64_t oldtxg, newtxg;
 315  315  
 316  316                  verify(nvlist_lookup_uint64(zhp->zpool_config,
 317  317                      ZPOOL_CONFIG_POOL_TXG, &oldtxg) == 0);
 318  318                  verify(nvlist_lookup_uint64(config,
 319  319                      ZPOOL_CONFIG_POOL_TXG, &newtxg) == 0);
 320  320  
 321      -                if (zhp->zpool_old_config != NULL)
 322      -                        nvlist_free(zhp->zpool_old_config);
      321 +                nvlist_free(zhp->zpool_old_config);
 323  322  
 324  323                  if (oldtxg != newtxg) {
 325  324                          nvlist_free(zhp->zpool_config);
 326  325                          zhp->zpool_old_config = NULL;
 327  326                  } else {
 328  327                          zhp->zpool_old_config = zhp->zpool_config;
 329  328                  }
 330  329          }
 331  330  
 332  331          zhp->zpool_config = config;
↓ open down ↓ 123 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX