| dmu_diff.c (260183) | dmu_diff.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) 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) 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 */ 25 26#include <sys/dmu.h> 27#include <sys/dmu_impl.h> 28#include <sys/dmu_tx.h> 29#include <sys/dbuf.h> 30#include <sys/dnode.h> 31#include <sys/zfs_context.h> --- 93 unchanged lines hidden (view full) --- 125 126#define DBP_SPAN(dnp, level) \ 127 (((uint64_t)dnp->dn_datablkszsec) << (SPA_MINBLOCKSHIFT + \ 128 (level) * (dnp->dn_indblkshift - SPA_BLKPTRSHIFT))) 129 130/* ARGSUSED */ 131static int 132diff_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, | 24 */ 25 26#include <sys/dmu.h> 27#include <sys/dmu_impl.h> 28#include <sys/dmu_tx.h> 29#include <sys/dbuf.h> 30#include <sys/dnode.h> 31#include <sys/zfs_context.h> --- 93 unchanged lines hidden (view full) --- 125 126#define DBP_SPAN(dnp, level) \ 127 (((uint64_t)dnp->dn_datablkszsec) << (SPA_MINBLOCKSHIFT + \ 128 (level) * (dnp->dn_indblkshift - SPA_BLKPTRSHIFT))) 129 130/* ARGSUSED */ 131static int 132diff_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, |
| 133 const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg) | 133 const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg) |
| 134{ 135 struct diffarg *da = arg; 136 int err = 0; 137 138 if (issig(JUSTLOOKING) && issig(FORREAL)) 139 return (SET_ERROR(EINTR)); 140 141 if (zb->zb_object != DMU_META_DNODE_OBJECT) --- 110 unchanged lines hidden --- | 134{ 135 struct diffarg *da = arg; 136 int err = 0; 137 138 if (issig(JUSTLOOKING) && issig(FORREAL)) 139 return (SET_ERROR(EINTR)); 140 141 if (zb->zb_object != DMU_META_DNODE_OBJECT) --- 110 unchanged lines hidden --- |