Print this page
4374 dn_free_ranges should use range_tree_t
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Max Grossman <max.grossman@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Dan McDonald <danmcd@omniti.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/zfs/zio.c
          +++ new/usr/src/uts/common/fs/zfs/zio.c
↓ open down ↓ 12 lines elided ↑ open up ↑
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  23      - * Copyright (c) 2013 by Delphix. All rights reserved.
       23 + * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  24   24   * Copyright (c) 2011 Nexenta Systems, Inc. All rights reserved.
  25   25   * Copyright 2013 Joyent, Inc. All rights reserved.
  26   26   */
  27   27  
  28   28  #include <sys/zfs_context.h>
  29   29  #include <sys/fm/fs/zfs.h>
  30   30  #include <sys/spa.h>
  31   31  #include <sys/txg.h>
  32   32  #include <sys/spa_impl.h>
  33   33  #include <sys/vdev_impl.h>
↓ open down ↓ 1225 lines elided ↑ open up ↑
1259 1259                   */
1260 1260                  if ((stage & ZIO_BLOCKING_STAGES) && zio->io_vd == NULL &&
1261 1261                      zio_taskq_member(zio, ZIO_TASKQ_INTERRUPT)) {
1262 1262                          boolean_t cut = (stage == ZIO_STAGE_VDEV_IO_START) ?
1263 1263                              zio_requeue_io_start_cut_in_line : B_FALSE;
1264 1264                          zio_taskq_dispatch(zio, ZIO_TASKQ_ISSUE, cut);
1265 1265                          return;
1266 1266                  }
1267 1267  
1268 1268                  zio->io_stage = stage;
1269      -                rv = zio_pipeline[highbit(stage) - 1](zio);
     1269 +                rv = zio_pipeline[highbit64(stage) - 1](zio);
1270 1270  
1271 1271                  if (rv == ZIO_PIPELINE_STOP)
1272 1272                          return;
1273 1273  
1274 1274                  ASSERT(rv == ZIO_PIPELINE_CONTINUE);
1275 1275          }
1276 1276  }
1277 1277  
1278 1278  /*
1279 1279   * ==========================================================================
↓ open down ↓ 1912 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX