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/sys/zio.h
          +++ new/usr/src/uts/common/fs/zfs/sys/zio.h
↓ open down ↓ 434 lines elided ↑ open up ↑
 435  435  
 436  436          /* FMA state */
 437  437          zio_cksum_report_t *io_cksum_report;
 438  438          uint64_t        io_ena;
 439  439  
 440  440          /* Taskq dispatching state */
 441  441          taskq_ent_t     io_tqent;
 442  442  };
 443  443  
 444  444  extern zio_t *zio_null(zio_t *pio, spa_t *spa, vdev_t *vd,
 445      -    zio_done_func_t *done, void *private, enum zio_flag flags);
      445 +    zio_done_func_t *done, void *io_private, enum zio_flag flags);
 446  446  
 447  447  extern zio_t *zio_root(spa_t *spa,
 448      -    zio_done_func_t *done, void *private, enum zio_flag flags);
      448 +    zio_done_func_t *done, void *io_private, enum zio_flag flags);
 449  449  
 450  450  extern zio_t *zio_read(zio_t *pio, spa_t *spa, const blkptr_t *bp, void *data,
 451      -    uint64_t size, zio_done_func_t *done, void *private,
      451 +    uint64_t size, zio_done_func_t *done, void *io_private,
 452  452      int priority, enum zio_flag flags, const zbookmark_t *zb);
 453  453  
 454  454  extern zio_t *zio_write(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
 455  455      void *data, uint64_t size, const zio_prop_t *zp,
 456      -    zio_done_func_t *ready, zio_done_func_t *done, void *private,
      456 +    zio_done_func_t *ready, zio_done_func_t *done, void *io_private,
 457  457      int priority, enum zio_flag flags, const zbookmark_t *zb);
 458  458  
 459  459  extern zio_t *zio_rewrite(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
 460      -    void *data, uint64_t size, zio_done_func_t *done, void *private,
      460 +    void *data, uint64_t size, zio_done_func_t *done, void *io_private,
 461  461      int priority, enum zio_flag flags, zbookmark_t *zb);
 462  462  
 463  463  extern void zio_write_override(zio_t *zio, blkptr_t *bp, int copies,
 464  464      boolean_t nopwrite);
 465  465  
 466  466  extern void zio_free(spa_t *spa, uint64_t txg, const blkptr_t *bp);
 467  467  
 468  468  extern zio_t *zio_claim(zio_t *pio, spa_t *spa, uint64_t txg,
 469  469      const blkptr_t *bp,
 470      -    zio_done_func_t *done, void *private, enum zio_flag flags);
      470 +    zio_done_func_t *done, void *io_private, enum zio_flag flags);
 471  471  
 472  472  extern zio_t *zio_ioctl(zio_t *pio, spa_t *spa, vdev_t *vd, int cmd,
 473      -    zio_done_func_t *done, void *private, int priority, enum zio_flag flags);
      473 +    zio_done_func_t *done, void *io_private, int priority,
      474 +    enum zio_flag flags);
 474  475  
 475  476  extern zio_t *zio_read_phys(zio_t *pio, vdev_t *vd, uint64_t offset,
 476  477      uint64_t size, void *data, int checksum,
 477      -    zio_done_func_t *done, void *private, int priority, enum zio_flag flags,
      478 +    zio_done_func_t *done, void *io_private, int priority, enum zio_flag flags,
 478  479      boolean_t labels);
 479  480  
 480  481  extern zio_t *zio_write_phys(zio_t *pio, vdev_t *vd, uint64_t offset,
 481  482      uint64_t size, void *data, int checksum,
 482      -    zio_done_func_t *done, void *private, int priority, enum zio_flag flags,
      483 +    zio_done_func_t *done, void *io_private, int priority, enum zio_flag flags,
 483  484      boolean_t labels);
 484  485  
 485  486  extern zio_t *zio_free_sync(zio_t *pio, spa_t *spa, uint64_t txg,
 486  487      const blkptr_t *bp, enum zio_flag flags);
 487  488  
 488  489  extern int zio_alloc_zil(spa_t *spa, uint64_t txg, blkptr_t *new_bp,
 489  490      blkptr_t *old_bp, uint64_t size, boolean_t use_slog);
 490  491  extern void zio_free_zil(spa_t *spa, uint64_t txg, blkptr_t *bp);
 491  492  extern void zio_flush(zio_t *zio, vdev_t *vd);
 492  493  extern void zio_shrink(zio_t *zio, uint64_t size);
↓ open down ↓ 10 lines elided ↑ open up ↑
 503  504  
 504  505  extern void *zio_buf_alloc(size_t size);
 505  506  extern void zio_buf_free(void *buf, size_t size);
 506  507  extern void *zio_data_buf_alloc(size_t size);
 507  508  extern void zio_data_buf_free(void *buf, size_t size);
 508  509  
 509  510  extern void zio_resubmit_stage_async(void *);
 510  511  
 511  512  extern zio_t *zio_vdev_child_io(zio_t *zio, blkptr_t *bp, vdev_t *vd,
 512  513      uint64_t offset, void *data, uint64_t size, int type, int priority,
 513      -    enum zio_flag flags, zio_done_func_t *done, void *private);
      514 +    enum zio_flag flags, zio_done_func_t *done, void *io_private);
 514  515  
 515  516  extern zio_t *zio_vdev_delegated_io(vdev_t *vd, uint64_t offset,
 516  517      void *data, uint64_t size, int type, int priority,
 517      -    enum zio_flag flags, zio_done_func_t *done, void *private);
      518 +    enum zio_flag flags, zio_done_func_t *done, void *io_private);
 518  519  
 519  520  extern void zio_vdev_io_bypass(zio_t *zio);
 520  521  extern void zio_vdev_io_reissue(zio_t *zio);
 521  522  extern void zio_vdev_io_redone(zio_t *zio);
 522  523  
 523  524  extern void zio_checksum_verified(zio_t *zio);
 524  525  extern int zio_worst_error(int e1, int e2);
 525  526  
 526  527  extern enum zio_checksum zio_checksum_select(enum zio_checksum child,
 527  528      enum zio_checksum parent);
↓ open down ↓ 60 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX