Print this page
3748 zfs headers should be C++ compatible
Submitted by:   Justin Gibbs <justing@spectralogic.com>
Submitted by:   Will Andrews <willa@spectralogic.com>
Reviewed by:    Matthew Ahrens <mahrens@delphix.com>
Reviewed by:    Eric Schrock <eric.schrock@delphix.com>
Reviewed by:    Robert Mustacchi <rm@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/zfs/ddt.c
          +++ new/usr/src/uts/common/fs/zfs/ddt.c
↓ open down ↓ 170 lines elided ↑ open up ↑
 171  171      ddt_entry_t *dde)
 172  172  {
 173  173          if (!ddt_object_exists(ddt, type, class))
 174  174                  return;
 175  175  
 176  176          ddt_ops[type]->ddt_op_prefetch(ddt->ddt_os,
 177  177              ddt->ddt_object[type][class], dde);
 178  178  }
 179  179  
 180  180  int
 181      -ddt_object_update(ddt_t *ddt, enum ddt_type type, enum ddt_class class,
      181 +ddt_object_update(ddt_t *ddt, enum ddt_type type, enum ddt_class ddt_class,
 182  182      ddt_entry_t *dde, dmu_tx_t *tx)
 183  183  {
 184      -        ASSERT(ddt_object_exists(ddt, type, class));
      184 +        ASSERT(ddt_object_exists(ddt, type, ddt_class));
 185  185  
 186  186          return (ddt_ops[type]->ddt_op_update(ddt->ddt_os,
 187      -            ddt->ddt_object[type][class], dde, tx));
      187 +            ddt->ddt_object[type][ddt_class], dde, tx));
 188  188  }
 189  189  
 190  190  static int
 191  191  ddt_object_remove(ddt_t *ddt, enum ddt_type type, enum ddt_class class,
 192  192      ddt_entry_t *dde, dmu_tx_t *tx)
 193  193  {
 194  194          ASSERT(ddt_object_exists(ddt, type, class));
 195  195  
 196  196          return (ddt_ops[type]->ddt_op_remove(ddt->ddt_os,
 197  197              ddt->ddt_object[type][class], dde, tx));
 198  198  }
 199  199  
 200  200  int
 201      -ddt_object_walk(ddt_t *ddt, enum ddt_type type, enum ddt_class class,
      201 +ddt_object_walk(ddt_t *ddt, enum ddt_type type, enum ddt_class ddt_class,
 202  202      uint64_t *walk, ddt_entry_t *dde)
 203  203  {
 204      -        ASSERT(ddt_object_exists(ddt, type, class));
      204 +        ASSERT(ddt_object_exists(ddt, type, ddt_class));
 205  205  
 206  206          return (ddt_ops[type]->ddt_op_walk(ddt->ddt_os,
 207      -            ddt->ddt_object[type][class], dde, walk));
      207 +            ddt->ddt_object[type][ddt_class], dde, walk));
 208  208  }
 209  209  
 210  210  uint64_t
 211      -ddt_object_count(ddt_t *ddt, enum ddt_type type, enum ddt_class class)
      211 +ddt_object_count(ddt_t *ddt, enum ddt_type type, enum ddt_class ddt_class)
 212  212  {
 213      -        ASSERT(ddt_object_exists(ddt, type, class));
      213 +        ASSERT(ddt_object_exists(ddt, type, ddt_class));
 214  214  
 215  215          return (ddt_ops[type]->ddt_op_count(ddt->ddt_os,
 216      -            ddt->ddt_object[type][class]));
      216 +            ddt->ddt_object[type][ddt_class]));
 217  217  }
 218  218  
 219  219  int
 220      -ddt_object_info(ddt_t *ddt, enum ddt_type type, enum ddt_class class,
      220 +ddt_object_info(ddt_t *ddt, enum ddt_type type, enum ddt_class ddt_class,
 221  221      dmu_object_info_t *doi)
 222  222  {
 223      -        if (!ddt_object_exists(ddt, type, class))
      223 +        if (!ddt_object_exists(ddt, type, ddt_class))
 224  224                  return (SET_ERROR(ENOENT));
 225  225  
 226      -        return (dmu_object_info(ddt->ddt_os, ddt->ddt_object[type][class],
      226 +        return (dmu_object_info(ddt->ddt_os, ddt->ddt_object[type][ddt_class],
 227  227              doi));
 228  228  }
 229  229  
 230  230  boolean_t
 231      -ddt_object_exists(ddt_t *ddt, enum ddt_type type, enum ddt_class class)
      231 +ddt_object_exists(ddt_t *ddt, enum ddt_type type, enum ddt_class ddt_class)
 232  232  {
 233      -        return (!!ddt->ddt_object[type][class]);
      233 +        return (!!ddt->ddt_object[type][ddt_class]);
 234  234  }
 235  235  
 236  236  void
 237      -ddt_object_name(ddt_t *ddt, enum ddt_type type, enum ddt_class class,
      237 +ddt_object_name(ddt_t *ddt, enum ddt_type type, enum ddt_class ddt_class,
 238  238      char *name)
 239  239  {
 240  240          (void) sprintf(name, DMU_POOL_DDT,
 241  241              zio_checksum_table[ddt->ddt_checksum].ci_name,
 242      -            ddt_ops[type]->ddt_op_name, ddt_class_name[class]);
      242 +            ddt_ops[type]->ddt_op_name, ddt_class_name[ddt_class]);
 243  243  }
 244  244  
 245  245  void
 246  246  ddt_bp_fill(const ddt_phys_t *ddp, blkptr_t *bp, uint64_t txg)
 247  247  {
 248  248          ASSERT(txg != 0);
 249  249  
 250  250          for (int d = 0; d < SPA_DVAS_PER_BP; d++)
 251  251                  bp->blk_dva[d] = ddp->ddp_dva[d];
 252  252          BP_SET_BIRTH(bp, txg, ddp->ddp_phys_birth);
↓ open down ↓ 893 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX