Deleted Added
full compact
dsl_scan.c (304127) dsl_scan.c (307108)
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

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

1110 dsl_scan_zil(dp, &os->os_zil_header);
1111
1112 /*
1113 * Iterate over the bps in this ds.
1114 */
1115 dmu_buf_will_dirty(ds->ds_dbuf, tx);
1116 dsl_scan_visit_rootbp(scn, ds, &dsl_dataset_phys(ds)->ds_bp, tx);
1117
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

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

1110 dsl_scan_zil(dp, &os->os_zil_header);
1111
1112 /*
1113 * Iterate over the bps in this ds.
1114 */
1115 dmu_buf_will_dirty(ds->ds_dbuf, tx);
1116 dsl_scan_visit_rootbp(scn, ds, &dsl_dataset_phys(ds)->ds_bp, tx);
1117
1118 char *dsname = kmem_alloc(ZFS_MAXNAMELEN, KM_SLEEP);
1118 char *dsname = kmem_alloc(ZFS_MAX_DATASET_NAME_LEN, KM_SLEEP);
1119 dsl_dataset_name(ds, dsname);
1120 zfs_dbgmsg("scanned dataset %llu (%s) with min=%llu max=%llu; "
1121 "pausing=%u",
1122 (longlong_t)dsobj, dsname,
1123 (longlong_t)scn->scn_phys.scn_cur_min_txg,
1124 (longlong_t)scn->scn_phys.scn_cur_max_txg,
1125 (int)scn->scn_pausing);
1119 dsl_dataset_name(ds, dsname);
1120 zfs_dbgmsg("scanned dataset %llu (%s) with min=%llu max=%llu; "
1121 "pausing=%u",
1122 (longlong_t)dsobj, dsname,
1123 (longlong_t)scn->scn_phys.scn_cur_min_txg,
1124 (longlong_t)scn->scn_phys.scn_cur_max_txg,
1125 (int)scn->scn_pausing);
1126 kmem_free(dsname, ZFS_MAXNAMELEN);
1126 kmem_free(dsname, ZFS_MAX_DATASET_NAME_LEN);
1127
1128 if (scn->scn_pausing)
1129 goto out;
1130
1131 /*
1132 * We've finished this pass over this dataset.
1133 */
1134

--- 786 unchanged lines hidden ---
1127
1128 if (scn->scn_pausing)
1129 goto out;
1130
1131 /*
1132 * We've finished this pass over this dataset.
1133 */
1134

--- 786 unchanged lines hidden ---