Deleted Added
full compact
dnode_sync.c (219089) dnode_sync.c (236884)
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

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

13 * When distributing Covered Code, include this CDDL HEADER in each
14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
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 */
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

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

13 * When distributing Covered Code, include this CDDL HEADER in each
14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
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
21/*
22 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
22/*
23 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
24 * Copyright (c) 2012 by Delphix. All rights reserved.
23 */
24
25#include <sys/zfs_context.h>
26#include <sys/dbuf.h>
27#include <sys/dnode.h>
28#include <sys/dmu.h>
29#include <sys/dmu_tx.h>
30#include <sys/dmu_objset.h>

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

592 dnp->dn_bonuslen = 0;
593 else
594 dnp->dn_bonuslen = dn->dn_next_bonuslen[txgoff];
595 ASSERT(dnp->dn_bonuslen <= DN_MAX_BONUSLEN);
596 dn->dn_next_bonuslen[txgoff] = 0;
597 }
598
599 if (dn->dn_next_bonustype[txgoff]) {
25 */
26
27#include <sys/zfs_context.h>
28#include <sys/dbuf.h>
29#include <sys/dnode.h>
30#include <sys/dmu.h>
31#include <sys/dmu_tx.h>
32#include <sys/dmu_objset.h>

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

594 dnp->dn_bonuslen = 0;
595 else
596 dnp->dn_bonuslen = dn->dn_next_bonuslen[txgoff];
597 ASSERT(dnp->dn_bonuslen <= DN_MAX_BONUSLEN);
598 dn->dn_next_bonuslen[txgoff] = 0;
599 }
600
601 if (dn->dn_next_bonustype[txgoff]) {
600 ASSERT(dn->dn_next_bonustype[txgoff] < DMU_OT_NUMTYPES);
602 ASSERT(DMU_OT_IS_VALID(dn->dn_next_bonustype[txgoff]));
601 dnp->dn_bonustype = dn->dn_next_bonustype[txgoff];
602 dn->dn_next_bonustype[txgoff] = 0;
603 }
604
605 /*
606 * We will either remove a spill block when a file is being removed
607 * or we have been asked to remove it.
608 */

--- 88 unchanged lines hidden ---
603 dnp->dn_bonustype = dn->dn_next_bonustype[txgoff];
604 dn->dn_next_bonustype[txgoff] = 0;
605 }
606
607 /*
608 * We will either remove a spill block when a file is being removed
609 * or we have been asked to remove it.
610 */

--- 88 unchanged lines hidden ---