Print this page
6659 nvlist_free(NULL) is a no-op

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/zfs/spa.c
          +++ new/usr/src/uts/common/fs/zfs/spa.c
↓ open down ↓ 5998 lines elided ↑ open up ↑
5999 5999          /*
6000 6000           * If we're upgrading the spa version then make sure that
6001 6001           * the config object gets updated with the correct version.
6002 6002           */
6003 6003          if (spa->spa_ubsync.ub_version < spa->spa_uberblock.ub_version)
6004 6004                  fnvlist_add_uint64(config, ZPOOL_CONFIG_VERSION,
6005 6005                      spa->spa_uberblock.ub_version);
6006 6006  
6007 6007          spa_config_exit(spa, SCL_STATE, FTAG);
6008 6008  
6009      -        if (spa->spa_config_syncing)
6010      -                nvlist_free(spa->spa_config_syncing);
     6009 +        nvlist_free(spa->spa_config_syncing);
6011 6010          spa->spa_config_syncing = config;
6012 6011  
6013 6012          spa_sync_nvlist(spa, spa->spa_config_object, config, tx);
6014 6013  }
6015 6014  
6016 6015  static void
6017 6016  spa_sync_version(void *arg, dmu_tx_t *tx)
6018 6017  {
6019 6018          uint64_t *versionp = arg;
6020 6019          uint64_t version = *versionp;
↓ open down ↓ 684 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX