diff options
| author | George Wilson <George.Wilson@Sun.COM> | 2010-05-03 11:16:14 -0700 |
|---|---|---|
| committer | George Wilson <George.Wilson@Sun.COM> | 2010-05-03 11:16:14 -0700 |
| commit | 3113f7cee6785cfe8d9e78c535cf9e2a79283275 (patch) | |
| tree | 30eae80fd95e19d251f772e6fe21d51366db3273 /usr/src/uts/common/fs/zfs/dsl_scrub.c | |
| parent | 55da60b91d96984f12de050ce428373ea25c7f35 (diff) | |
| download | illumos-joyent-3113f7cee6785cfe8d9e78c535cf9e2a79283275.tar.gz | |
6948911 snapshot deletion can induce unsatisfiable allocations in txg sync
Diffstat (limited to 'usr/src/uts/common/fs/zfs/dsl_scrub.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dsl_scrub.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/dsl_scrub.c b/usr/src/uts/common/fs/zfs/dsl_scrub.c index 269e1c4f6f..b16ff66586 100644 --- a/usr/src/uts/common/fs/zfs/dsl_scrub.c +++ b/usr/src/uts/common/fs/zfs/dsl_scrub.c @@ -19,8 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. */ #include <sys/dsl_pool.h> @@ -272,6 +271,13 @@ dsl_free(dsl_pool_t *dp, uint64_t txg, const blkptr_t *bpp) zio_free(dp->dp_spa, txg, bpp); } +void +dsl_free_sync(zio_t *pio, dsl_pool_t *dp, uint64_t txg, const blkptr_t *bpp) +{ + ASSERT(dsl_pool_sync_context(dp)); + zio_nowait(zio_free_sync(pio, dp->dp_spa, txg, bpp, pio->io_flags)); +} + static boolean_t bookmark_is_zero(const zbookmark_t *zb) { |
