diff options
Diffstat (limited to 'usr/src/uts/common/sys/scsi')
| -rw-r--r-- | usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_hash.h | 61 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h | 4 |
2 files changed, 2 insertions, 63 deletions
diff --git a/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_hash.h b/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_hash.h deleted file mode 100644 index 2069e6d3f1..0000000000 --- a/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_hash.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * This file and its contents are supplied under the terms of the - * Common Development and Distribution License ("CDDL"), version 1.0. - * You may only use this file in accordance with the terms of version - * 1.0 of the CDDL. - * - * A full copy of the text of the CDDL should have accompanied this - * source. A copy of the CDDL is also available via the Internet at - * http://www.illumos.org/license/CDDL. - */ - -/* - * Copyright 2014 Joyent, Inc. All rights reserved. - */ - -#ifndef _SYS_SCSI_ADAPTERS_MPTHASH_H -#define _SYS_SCSI_ADAPTERS_MPTHASH_H - -#include <sys/types.h> -#include <sys/list.h> - -#define RHL_F_DEAD 0x01 - -typedef struct refhash_link { - list_node_t rhl_chain_link; - list_node_t rhl_global_link; - uint_t rhl_flags; - uint_t rhl_refcnt; -} refhash_link_t; - -typedef uint64_t (*refhash_hash_f)(const void *); -typedef int (*refhash_cmp_f)(const void *, const void *); -typedef void (*refhash_dtor_f)(void *); -typedef int (*refhash_eval_f)(const void *, void *); - -typedef struct refhash { - list_t *rh_buckets; - uint_t rh_bucket_count; - list_t rh_objs; - size_t rh_obj_size; /* used by mdb */ - size_t rh_link_off; - size_t rh_tag_off; - refhash_hash_f rh_hash; - refhash_cmp_f rh_cmp; - refhash_dtor_f rh_dtor; -} refhash_t; - -extern refhash_t *refhash_create(uint_t, refhash_hash_f, refhash_cmp_f, - refhash_dtor_f, size_t, size_t, size_t, int); -extern void refhash_destroy(refhash_t *); -extern void refhash_insert(refhash_t *, void *); -extern void refhash_remove(refhash_t *, void *); -extern void *refhash_lookup(refhash_t *, const void *); -extern void *refhash_linear_search(refhash_t *, refhash_eval_f, void *); -extern void refhash_hold(refhash_t *, void *); -extern void refhash_rele(refhash_t *, void *); -extern void *refhash_first(refhash_t *); -extern void *refhash_next(refhash_t *, void *); -extern boolean_t refhash_obj_valid(refhash_t *hp, const void *); - -#endif /* _SYS_SCSI_ADAPTERS_MPTHASH_H */ diff --git a/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h b/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h index 836548aa30..2689fe27c4 100644 --- a/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h +++ b/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h @@ -22,7 +22,7 @@ /* * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2014 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright 2015, Joyent, Inc. * Copyright (c) 2014, Tegile Systems Inc. All rights reserved. */ @@ -58,10 +58,10 @@ #include <sys/byteorder.h> #include <sys/queue.h> +#include <sys/refhash.h> #include <sys/isa_defs.h> #include <sys/sunmdi.h> #include <sys/mdi_impldefs.h> -#include <sys/scsi/adapters/mpt_sas/mptsas_hash.h> #include <sys/scsi/adapters/mpt_sas/mptsas_ioctl.h> #include <sys/scsi/adapters/mpt_sas/mpi/mpi2_tool.h> #include <sys/scsi/adapters/mpt_sas/mpi/mpi2_cnfg.h> |