| dmu_tx.c (226512) | dmu_tx.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 --- 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 */ 24/* | |
| 25 * Copyright 2011 Nexenta Systems, Inc. All rights reserved. | 23 * Copyright 2011 Nexenta Systems, Inc. All rights reserved. |
| 24 * Copyright (c) 2012 by Delphix. All rights reserved. |
|
| 26 */ 27 28#include <sys/dmu.h> 29#include <sys/dmu_impl.h> 30#include <sys/dbuf.h> 31#include <sys/dmu_tx.h> 32#include <sys/dmu_objset.h> 33#include <sys/dsl_dataset.h> /* for dsl_dataset_block_freeable() */ --- 637 unchanged lines hidden (view full) --- 671 * We will be able to fit a new object's entries into one leaf 672 * block. So there will be at most 2 blocks total, 673 * including the header block. 674 */ 675 dmu_tx_count_write(txh, 0, 2 << fzap_default_block_shift); 676 return; 677 } 678 | 25 */ 26 27#include <sys/dmu.h> 28#include <sys/dmu_impl.h> 29#include <sys/dbuf.h> 30#include <sys/dmu_tx.h> 31#include <sys/dmu_objset.h> 32#include <sys/dsl_dataset.h> /* for dsl_dataset_block_freeable() */ --- 637 unchanged lines hidden (view full) --- 670 * We will be able to fit a new object's entries into one leaf 671 * block. So there will be at most 2 blocks total, 672 * including the header block. 673 */ 674 dmu_tx_count_write(txh, 0, 2 << fzap_default_block_shift); 675 return; 676 } 677 |
| 679 ASSERT3P(dmu_ot[dn->dn_type].ot_byteswap, ==, zap_byteswap); | 678 ASSERT3P(DMU_OT_BYTESWAP(dn->dn_type), ==, DMU_BSWAP_ZAP); |
| 680 681 if (dn->dn_maxblkid == 0 && !add) { 682 blkptr_t *bp; 683 684 /* 685 * If there is only one block (i.e. this is a micro-zap) 686 * and we are not adding anything, the accounting is simple. 687 */ --- 699 unchanged lines hidden --- | 679 680 if (dn->dn_maxblkid == 0 && !add) { 681 blkptr_t *bp; 682 683 /* 684 * If there is only one block (i.e. this is a micro-zap) 685 * and we are not adding anything, the accounting is simple. 686 */ --- 699 unchanged lines hidden --- |