| dmu_objset.c (332525) | dmu_objset.c (339034) |
|---|---|
| 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 --- 335 unchanged lines hidden (view full) --- 344dmu_objset_open_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp, 345 objset_t **osp) 346{ 347 objset_t *os; 348 int i, err; 349 350 ASSERT(ds == NULL || MUTEX_HELD(&ds->ds_opening_lock)); 351 | 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 --- 335 unchanged lines hidden (view full) --- 344dmu_objset_open_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp, 345 objset_t **osp) 346{ 347 objset_t *os; 348 int i, err; 349 350 ASSERT(ds == NULL || MUTEX_HELD(&ds->ds_opening_lock)); 351 |
| 352#if 0 |
|
| 352 /* 353 * The $ORIGIN dataset (if it exists) doesn't have an associated 354 * objset, so there's no reason to open it. The $ORIGIN dataset 355 * will not exist on pools older than SPA_VERSION_ORIGIN. 356 */ 357 if (ds != NULL && spa_get_dsl(spa) != NULL && 358 spa_get_dsl(spa)->dp_origin_snap != NULL) { 359 ASSERT3P(ds->ds_dir, !=, 360 spa_get_dsl(spa)->dp_origin_snap->ds_dir); 361 } | 353 /* 354 * The $ORIGIN dataset (if it exists) doesn't have an associated 355 * objset, so there's no reason to open it. The $ORIGIN dataset 356 * will not exist on pools older than SPA_VERSION_ORIGIN. 357 */ 358 if (ds != NULL && spa_get_dsl(spa) != NULL && 359 spa_get_dsl(spa)->dp_origin_snap != NULL) { 360 ASSERT3P(ds->ds_dir, !=, 361 spa_get_dsl(spa)->dp_origin_snap->ds_dir); 362 } |
| 363#endif |
|
| 362 363 os = kmem_zalloc(sizeof (objset_t), KM_SLEEP); 364 os->os_dsl_dataset = ds; 365 os->os_spa = spa; 366 os->os_rootbp = bp; 367 if (!BP_IS_HOLE(os->os_rootbp)) { 368 arc_flags_t aflags = ARC_FLAG_WAIT; 369 zbookmark_phys_t zb; --- 1978 unchanged lines hidden --- | 364 365 os = kmem_zalloc(sizeof (objset_t), KM_SLEEP); 366 os->os_dsl_dataset = ds; 367 os->os_spa = spa; 368 os->os_rootbp = bp; 369 if (!BP_IS_HOLE(os->os_rootbp)) { 370 arc_flags_t aflags = ARC_FLAG_WAIT; 371 zbookmark_phys_t zb; --- 1978 unchanged lines hidden --- |