diff options
| author | Brian Behlendorf <[email protected]> | 2010-08-26 14:24:34 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2010-08-26 14:24:34 -0700 |
| commit | 572e285762521df27fe5b026f409ba1a21abb7ac (patch) | |
| tree | f5d0e8e3bd3c0956d437251974b67d88fea46304 /module/zfs/include/sys/sa.h | |
| parent | 1980602bfae0605d3231e79627b3e25c07991b0e (diff) | |
Update to onnv_147
This is the last official OpenSolaris tag before the public
development tree was closed.
Diffstat (limited to 'module/zfs/include/sys/sa.h')
| -rw-r--r-- | module/zfs/include/sys/sa.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/module/zfs/include/sys/sa.h b/module/zfs/include/sys/sa.h index e9a96a0f9..bc89fa07d 100644 --- a/module/zfs/include/sys/sa.h +++ b/module/zfs/include/sys/sa.h @@ -19,8 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. */ #ifndef _SYS_SA_H @@ -141,7 +140,7 @@ dmu_buf_t *sa_get_db(sa_handle_t *); uint64_t sa_handle_object(sa_handle_t *); boolean_t sa_attr_would_spill(sa_handle_t *, sa_attr_type_t, int size); void sa_register_update_callback(objset_t *, sa_update_cb_t *); -sa_attr_type_t *sa_setup(objset_t *, uint64_t, sa_attr_reg_t *, int); +int sa_setup(objset_t *, uint64_t, sa_attr_reg_t *, int, sa_attr_type_t **); void sa_tear_down(objset_t *); int sa_replace_all_by_template(sa_handle_t *, sa_bulk_attr_t *, int, dmu_tx_t *); |