diff options
| author | jv227347 <Jordan.Vaughan@Sun.com> | 2010-08-12 17:34:26 -0700 |
|---|---|---|
| committer | jv227347 <Jordan.Vaughan@Sun.com> | 2010-08-12 17:34:26 -0700 |
| commit | a19609f85693e4e7d7e744d836a4e87193c934e4 (patch) | |
| tree | 7ea27321d90fa4b9b61e48ec06e5b52f5f7b509a /usr/src/uts/common/sys/ipc_impl.h | |
| parent | a69116193464f859a8b27a2db19ad330ce163a55 (diff) | |
| download | illumos-joyent-a19609f85693e4e7d7e744d836a4e87193c934e4.tar.gz | |
6906740 Zones need an improved reference counting mechanism
Diffstat (limited to 'usr/src/uts/common/sys/ipc_impl.h')
| -rw-r--r-- | usr/src/uts/common/sys/ipc_impl.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/usr/src/uts/common/sys/ipc_impl.h b/usr/src/uts/common/sys/ipc_impl.h index 712317d2e1..0569c3e967 100644 --- a/usr/src/uts/common/sys/ipc_impl.h +++ b/usr/src/uts/common/sys/ipc_impl.h @@ -19,15 +19,12 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. */ #ifndef _IPC_IMPL_H #define _IPC_IMPL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/ipc.h> #include <sys/mutex.h> @@ -151,7 +148,7 @@ struct msqid_ds64 { (*(rctl_qty_t *)(((char *)&p->ipc_proj->kpj_data.kpd_ipc) + \ s->ipcs_rctlofs)) #define IPC_ZONE_USAGE(p, s) \ - (*(rctl_qty_t *)(((char *)&p->ipc_zone->zone_ipc) + \ + (*(rctl_qty_t *)(((char *)&p->ipc_zone_ref.zref_zone->zone_ipc) + \ s->ipcs_rctlofs)) #define IPC_LOCKED(s, o) \ MUTEX_HELD(&s->ipcs_table[IPC_INDEX(o->ipc_id)].ipct_lock) @@ -172,7 +169,7 @@ typedef struct kipc_perm { kproject_t *ipc_proj; /* creator's project */ uint_t ipc_id; /* id */ zoneid_t ipc_zoneid; /* creator's zone id */ - zone_t *ipc_zone; /* creator's zone */ + zone_ref_t ipc_zone_ref; /* reference to creator's zone */ } kipc_perm_t; typedef struct ipc_slot { |