| zap_micro.c (263390) | zap_micro.c (265740) |
|---|---|
| 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) 2005, 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) 2005, 2010, Oracle and/or its affiliates. All rights reserved. |
| 23 * Copyright (c) 2013 by Delphix. All rights reserved. | 23 * Copyright (c) 2011, 2014 by Delphix. All rights reserved. |
| 24 */ 25 26#include <sys/zio.h> 27#include <sys/spa.h> 28#include <sys/dmu.h> 29#include <sys/zfs_context.h> 30#include <sys/zap.h> 31#include <sys/refcount.h> --- 343 unchanged lines hidden (view full) --- 375 rw_init(&zap->zap_rwlock, 0, 0, 0); 376 rw_enter(&zap->zap_rwlock, RW_WRITER); 377 zap->zap_objset = os; 378 zap->zap_object = obj; 379 zap->zap_dbuf = db; 380 381 if (*(uint64_t *)db->db_data != ZBT_MICRO) { 382 mutex_init(&zap->zap_f.zap_num_entries_mtx, 0, 0, 0); | 24 */ 25 26#include <sys/zio.h> 27#include <sys/spa.h> 28#include <sys/dmu.h> 29#include <sys/zfs_context.h> 30#include <sys/zap.h> 31#include <sys/refcount.h> --- 343 unchanged lines hidden (view full) --- 375 rw_init(&zap->zap_rwlock, 0, 0, 0); 376 rw_enter(&zap->zap_rwlock, RW_WRITER); 377 zap->zap_objset = os; 378 zap->zap_object = obj; 379 zap->zap_dbuf = db; 380 381 if (*(uint64_t *)db->db_data != ZBT_MICRO) { 382 mutex_init(&zap->zap_f.zap_num_entries_mtx, 0, 0, 0); |
| 383 zap->zap_f.zap_block_shift = highbit(db->db_size) - 1; | 383 zap->zap_f.zap_block_shift = highbit64(db->db_size) - 1; |
| 384 } else { 385 zap->zap_ismicro = TRUE; 386 } 387 388 /* 389 * Make sure that zap_ismicro is set before we let others see 390 * it, because zap_lockdir() checks zap_ismicro without the lock 391 * held. --- 1075 unchanged lines hidden --- | 384 } else { 385 zap->zap_ismicro = TRUE; 386 } 387 388 /* 389 * Make sure that zap_ismicro is set before we let others see 390 * it, because zap_lockdir() checks zap_ismicro without the lock 391 * held. --- 1075 unchanged lines hidden --- |