Deleted Added
full compact
dmu_objset.c (277585) dmu_objset.c (277586)
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

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

288
289 ASSERT(ds == NULL || MUTEX_HELD(&ds->ds_opening_lock));
290
291 os = kmem_zalloc(sizeof (objset_t), KM_SLEEP);
292 os->os_dsl_dataset = ds;
293 os->os_spa = spa;
294 os->os_rootbp = bp;
295 if (!BP_IS_HOLE(os->os_rootbp)) {
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

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

288
289 ASSERT(ds == NULL || MUTEX_HELD(&ds->ds_opening_lock));
290
291 os = kmem_zalloc(sizeof (objset_t), KM_SLEEP);
292 os->os_dsl_dataset = ds;
293 os->os_spa = spa;
294 os->os_rootbp = bp;
295 if (!BP_IS_HOLE(os->os_rootbp)) {
296 uint32_t aflags = ARC_WAIT;
296 arc_flags_t aflags = ARC_FLAG_WAIT;
297 zbookmark_phys_t zb;
298 SET_BOOKMARK(&zb, ds ? ds->ds_object : DMU_META_OBJSET,
299 ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
300
301 if (DMU_OS_IS_L2CACHEABLE(os))
297 zbookmark_phys_t zb;
298 SET_BOOKMARK(&zb, ds ? ds->ds_object : DMU_META_OBJSET,
299 ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
300
301 if (DMU_OS_IS_L2CACHEABLE(os))
302 aflags |= ARC_L2CACHE;
302 aflags |= ARC_FLAG_L2CACHE;
303 if (DMU_OS_IS_L2COMPRESSIBLE(os))
303 if (DMU_OS_IS_L2COMPRESSIBLE(os))
304 aflags |= ARC_L2COMPRESS;
304 aflags |= ARC_FLAG_L2COMPRESS;
305
306 dprintf_bp(os->os_rootbp, "reading %s", "");
307 err = arc_read(NULL, spa, os->os_rootbp,
308 arc_getbuf_func, &os->os_phys_buf,
309 ZIO_PRIORITY_SYNC_READ, ZIO_FLAG_CANFAIL, &aflags, &zb);
310 if (err != 0) {
311 kmem_free(os, sizeof (objset_t));
312 /* convert checksum errors into IO errors */

--- 1517 unchanged lines hidden ---
305
306 dprintf_bp(os->os_rootbp, "reading %s", "");
307 err = arc_read(NULL, spa, os->os_rootbp,
308 arc_getbuf_func, &os->os_phys_buf,
309 ZIO_PRIORITY_SYNC_READ, ZIO_FLAG_CANFAIL, &aflags, &zb);
310 if (err != 0) {
311 kmem_free(os, sizeof (objset_t));
312 /* convert checksum errors into IO errors */

--- 1517 unchanged lines hidden ---