diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-07-18 16:22:19 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-07-18 16:22:19 +0000 |
| commit | f1cf1ab6d856ffb10ae7e44f10e17b457dcb698e (patch) | |
| tree | 88a38416301bd8688406c456788701b45f0a654f /usr/src/uts/common/fs/zfs/spa_misc.c | |
| parent | af57471d469f7bb4ddca3c9f26895497ff4a86e0 (diff) | |
| parent | 73527f441cbbd953fa42cc5a30a413bad75f24a9 (diff) | |
| download | illumos-joyent-f1cf1ab6d856ffb10ae7e44f10e17b457dcb698e.tar.gz | |
[illumos-gate merge]
commit 73527f441cbbd953fa42cc5a30a413bad75f24a9
4753 increase number of outstanding async writes when sync task is waiting
commit bbfa8ea8bb4168c969ba27d632dfe0aeec3fc0da
4631 zvol_get_stats triggering too many reads
commit 2a104a5236475eb73aa41eaaf3ed9f3ccbe0ca55
4958 zdb trips assert on pools with ashift >= 0xe
commit b4ecf764d8099c92d5c9c0f13a45514377f3d292
4995 panic in nlm_prog_4
commit 5cd496e3c5514951ae23bdd897cb29b202e2ff62
4994 nlm_register_lock_locally() fails to unlock held locks
commit 542a813c9f6736dc348fecc7244bf22b4e0a319c
5003 want kstats for per-zone cpu usage
Conflicts:
usr/src/uts/common/sys/zone.h
usr/src/uts/common/os/zone.c
usr/src/uts/common/klm/nlm_service.c
usr/src/uts/common/fs/zfs/metaslab.c
Diffstat (limited to 'usr/src/uts/common/fs/zfs/spa_misc.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/spa_misc.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/usr/src/uts/common/fs/zfs/spa_misc.c b/usr/src/uts/common/fs/zfs/spa_misc.c index 14bd2a0176..0504362726 100644 --- a/usr/src/uts/common/fs/zfs/spa_misc.c +++ b/usr/src/uts/common/fs/zfs/spa_misc.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. */ @@ -1876,6 +1876,16 @@ spa_writeable(spa_t *spa) return (!!(spa->spa_mode & FWRITE)); } +/* + * Returns true if there is a pending sync task in any of the current + * syncing txg, the current quiescing txg, or the current open txg. + */ +boolean_t +spa_has_pending_synctask(spa_t *spa) +{ + return (!txg_all_lists_empty(&spa->spa_dsl_pool->dp_sync_tasks)); +} + int spa_mode(spa_t *spa) { |