Deleted Added
full compact
dsl_pool.c (219089) dsl_pool.c (228103)
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) 2011 by Delphix. All rights reserved.
23 */
24
25#include <sys/dsl_pool.h>
26#include <sys/dsl_dataset.h>
27#include <sys/dsl_prop.h>
28#include <sys/dsl_dir.h>
29#include <sys/dsl_synctask.h>
30#include <sys/dsl_scan.h>

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

311
312 return (dp);
313}
314
315static int
316deadlist_enqueue_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
317{
318 dsl_deadlist_t *dl = arg;
24 */
25
26#include <sys/dsl_pool.h>
27#include <sys/dsl_dataset.h>
28#include <sys/dsl_prop.h>
29#include <sys/dsl_dir.h>
30#include <sys/dsl_synctask.h>
31#include <sys/dsl_scan.h>

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

312
313 return (dp);
314}
315
316static int
317deadlist_enqueue_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
318{
319 dsl_deadlist_t *dl = arg;
320 dsl_pool_t *dp = dmu_objset_pool(dl->dl_os);
321 rw_enter(&dp->dp_config_rwlock, RW_READER);
319 dsl_deadlist_insert(dl, bp, tx);
322 dsl_deadlist_insert(dl, bp, tx);
323 rw_exit(&dp->dp_config_rwlock);
320 return (0);
321}
322
323void
324dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
325{
326 zio_t *zio;
327 dmu_tx_t *tx;

--- 546 unchanged lines hidden ---
324 return (0);
325}
326
327void
328dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
329{
330 zio_t *zio;
331 dmu_tx_t *tx;

--- 546 unchanged lines hidden ---