| spa_history.c (249195) | spa_history.c (268473) |
|---|---|
| 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 --- 7 unchanged lines hidden (view full) --- 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/* 23 * Copyright (c) 2006, 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 --- 7 unchanged lines hidden (view full) --- 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/* 23 * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. |
| 24 * Copyright (c) 2013 by Delphix. All rights reserved. | 24 * Copyright (c) 2011, 2014 by Delphix. All rights reserved. |
| 25 */ 26 27#include <sys/spa.h> 28#include <sys/spa_impl.h> 29#include <sys/zap.h> 30#include <sys/dsl_synctask.h> 31#include <sys/dmu_tx.h> 32#include <sys/dmu_objset.h> --- 286 unchanged lines hidden (view full) --- 319 if (spa_history_zone() != NULL) { 320 fnvlist_add_string(nvarg, ZPOOL_HIST_ZONE, 321 spa_history_zone()); 322 } 323 fnvlist_add_uint64(nvarg, ZPOOL_HIST_WHO, crgetruid(CRED())); 324 325 /* Kick this off asynchronously; errors are ignored. */ 326 dsl_sync_task_nowait(spa_get_dsl(spa), spa_history_log_sync, | 25 */ 26 27#include <sys/spa.h> 28#include <sys/spa_impl.h> 29#include <sys/zap.h> 30#include <sys/dsl_synctask.h> 31#include <sys/dmu_tx.h> 32#include <sys/dmu_objset.h> --- 286 unchanged lines hidden (view full) --- 319 if (spa_history_zone() != NULL) { 320 fnvlist_add_string(nvarg, ZPOOL_HIST_ZONE, 321 spa_history_zone()); 322 } 323 fnvlist_add_uint64(nvarg, ZPOOL_HIST_WHO, crgetruid(CRED())); 324 325 /* Kick this off asynchronously; errors are ignored. */ 326 dsl_sync_task_nowait(spa_get_dsl(spa), spa_history_log_sync, |
| 327 nvarg, 0, tx); | 327 nvarg, 0, ZFS_SPACE_CHECK_NONE, tx); |
| 328 dmu_tx_commit(tx); 329 330 /* spa_history_log_sync will free nvl */ 331 return (err); 332 333} 334 335/* --- 124 unchanged lines hidden (view full) --- 460 461 fnvlist_add_string(nvl, ZPOOL_HIST_INT_NAME, operation); 462 fnvlist_add_uint64(nvl, ZPOOL_HIST_TXG, tx->tx_txg); 463 464 if (dmu_tx_is_syncing(tx)) { 465 spa_history_log_sync(nvl, tx); 466 } else { 467 dsl_sync_task_nowait(spa_get_dsl(spa), | 328 dmu_tx_commit(tx); 329 330 /* spa_history_log_sync will free nvl */ 331 return (err); 332 333} 334 335/* --- 124 unchanged lines hidden (view full) --- 460 461 fnvlist_add_string(nvl, ZPOOL_HIST_INT_NAME, operation); 462 fnvlist_add_uint64(nvl, ZPOOL_HIST_TXG, tx->tx_txg); 463 464 if (dmu_tx_is_syncing(tx)) { 465 spa_history_log_sync(nvl, tx); 466 } else { 467 dsl_sync_task_nowait(spa_get_dsl(spa), |
| 468 spa_history_log_sync, nvl, 0, tx); | 468 spa_history_log_sync, nvl, 0, ZFS_SPACE_CHECK_NONE, tx); |
| 469 } 470 /* spa_history_log_sync() will free nvl */ 471} 472 473void 474spa_history_log_internal(spa_t *spa, const char *operation, 475 dmu_tx_t *tx, const char *fmt, ...) 476{ --- 69 unchanged lines hidden --- | 469 } 470 /* spa_history_log_sync() will free nvl */ 471} 472 473void 474spa_history_log_internal(spa_t *spa, const char *operation, 475 dmu_tx_t *tx, const char *fmt, ...) 476{ --- 69 unchanged lines hidden --- |