Deleted Added
full compact
dsl_destroy.c (268075) dsl_destroy.c (268123)
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) 2012, 2014 by Delphix. All rights reserved.
24 * Copyright (c) 2013 Steven Hartland. All rights reserved.
25 * Copyright (c) 2013 by Joyent, Inc. All rights reserved.
26 */
27
28#include <sys/zfs_context.h>
29#include <sys/dsl_userhold.h>
30#include <sys/dsl_dataset.h>
31#include <sys/dsl_synctask.h>

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

529struct killarg {
530 dsl_dataset_t *ds;
531 dmu_tx_t *tx;
532};
533
534/* ARGSUSED */
535static int
536kill_blkptr(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
24 * Copyright (c) 2013 Steven Hartland. All rights reserved.
25 * Copyright (c) 2013 by Joyent, Inc. All rights reserved.
26 */
27
28#include <sys/zfs_context.h>
29#include <sys/dsl_userhold.h>
30#include <sys/dsl_dataset.h>
31#include <sys/dsl_synctask.h>

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

529struct killarg {
530 dsl_dataset_t *ds;
531 dmu_tx_t *tx;
532};
533
534/* ARGSUSED */
535static int
536kill_blkptr(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
537 const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
537 const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
538{
539 struct killarg *ka = arg;
540 dmu_tx_t *tx = ka->tx;
541
542 if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
543 return (0);
544
545 if (zb->zb_level == ZB_ZIL_LEVEL) {

--- 403 unchanged lines hidden ---
538{
539 struct killarg *ka = arg;
540 dmu_tx_t *tx = ka->tx;
541
542 if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
543 return (0);
544
545 if (zb->zb_level == ZB_ZIL_LEVEL) {

--- 403 unchanged lines hidden ---