| dmu_tx.c (307057) | dmu_tx.c (307292) |
|---|---|
| 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 --- 7 unchanged lines hidden (view full) --- 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 2011 Nexenta Systems, Inc. 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 --- 7 unchanged lines hidden (view full) --- 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 2011 Nexenta Systems, Inc. All rights reserved. |
| 24 * Copyright (c) 2012, 2015 by Delphix. All rights reserved. | 24 * Copyright (c) 2012, 2016 by Delphix. All rights reserved. |
| 25 * Copyright (c) 2014 Integros [integros.com] 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> --- 770 unchanged lines hidden (view full) --- 803 return; 804 } 805 806 if (dn->dn_maxblkid > 0 && name) { 807 /* 808 * access the name in this fat-zap so that we'll check 809 * for i/o errors to the leaf blocks, etc. 810 */ | 25 * Copyright (c) 2014 Integros [integros.com] 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> --- 770 unchanged lines hidden (view full) --- 803 return; 804 } 805 806 if (dn->dn_maxblkid > 0 && name) { 807 /* 808 * access the name in this fat-zap so that we'll check 809 * for i/o errors to the leaf blocks, etc. 810 */ |
| 811 err = zap_lookup(dn->dn_objset, dn->dn_object, name, 812 8, 0, NULL); | 811 err = zap_lookup_by_dnode(dn, name, 8, 0, NULL); |
| 813 if (err == EIO) { 814 tx->tx_err = err; 815 return; 816 } 817 } 818 | 812 if (err == EIO) { 813 tx->tx_err = err; 814 return; 815 } 816 } 817 |
| 819 err = zap_count_write(dn->dn_objset, dn->dn_object, name, add, | 818 err = zap_count_write_by_dnode(dn, name, add, |
| 820 &txh->txh_space_towrite, &txh->txh_space_tooverwrite); 821 822 /* 823 * If the modified blocks are scattered to the four winds, 824 * we'll have to modify an indirect twig for each. We can make 825 * modifications at up to 3 locations: 826 * - header block at the beginning of the object 827 * - target leaf block --- 894 unchanged lines hidden --- | 819 &txh->txh_space_towrite, &txh->txh_space_tooverwrite); 820 821 /* 822 * If the modified blocks are scattered to the four winds, 823 * we'll have to modify an indirect twig for each. We can make 824 * modifications at up to 3 locations: 825 * - header block at the beginning of the object 826 * - target leaf block --- 894 unchanged lines hidden --- |