Deleted Added
full compact
zio.c (265143) zio.c (265740)
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 6 unchanged lines hidden (view full) ---

15 * If applicable, add the following below this CDDL HEADER, with the
16 * fields enclosed by brackets "[]" replaced with your own identifying
17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 *
19 * CDDL HEADER END
20 */
21/*
22 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 6 unchanged lines hidden (view full) ---

15 * If applicable, add the following below this CDDL HEADER, with the
16 * fields enclosed by brackets "[]" replaced with your own identifying
17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 *
19 * CDDL HEADER END
20 */
21/*
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 * Copyright (c) 2011 Nexenta Systems, Inc. All rights reserved.
25 */
26
27#include <sys/zfs_context.h>
28#include <sys/fm/fs/zfs.h>
29#include <sys/spa.h>
30#include <sys/txg.h>
31#include <sys/spa_impl.h>

--- 1320 unchanged lines hidden (view full) ---

1352 zio_taskq_member(zio, ZIO_TASKQ_INTERRUPT)) {
1353 boolean_t cut = (stage == ZIO_STAGE_VDEV_IO_START) ?
1354 zio_requeue_io_start_cut_in_line : B_FALSE;
1355 zio_taskq_dispatch(zio, ZIO_TASKQ_ISSUE, cut);
1356 return;
1357 }
1358
1359 zio->io_stage = stage;
24 * Copyright (c) 2011 Nexenta Systems, Inc. All rights reserved.
25 */
26
27#include <sys/zfs_context.h>
28#include <sys/fm/fs/zfs.h>
29#include <sys/spa.h>
30#include <sys/txg.h>
31#include <sys/spa_impl.h>

--- 1320 unchanged lines hidden (view full) ---

1352 zio_taskq_member(zio, ZIO_TASKQ_INTERRUPT)) {
1353 boolean_t cut = (stage == ZIO_STAGE_VDEV_IO_START) ?
1354 zio_requeue_io_start_cut_in_line : B_FALSE;
1355 zio_taskq_dispatch(zio, ZIO_TASKQ_ISSUE, cut);
1356 return;
1357 }
1358
1359 zio->io_stage = stage;
1360 rv = zio_pipeline[highbit(stage) - 1](&zio);
1360 rv = zio_pipeline[highbit64(stage) - 1](&zio);
1361
1362 if (rv == ZIO_PIPELINE_STOP)
1363 return;
1364
1365 ASSERT(rv == ZIO_PIPELINE_CONTINUE);
1366 }
1367}
1368

--- 1978 unchanged lines hidden ---
1361
1362 if (rv == ZIO_PIPELINE_STOP)
1363 return;
1364
1365 ASSERT(rv == ZIO_PIPELINE_CONTINUE);
1366 }
1367}
1368

--- 1978 unchanged lines hidden ---