PSARC 2002/240 ZFS

6338653 Integrate ZFS
PSARC 2004/652 - DKIOCFLUSH
5096886 Write caching disks need mechanism to flush cache to physical media

3 files changed, 14 insertions, 13 deletions

diff --git a/usr/src/lib/libproc/common/Pcontrol.h b/usr/src/lib/libproc/common/Pcontrol.h
index 5d3797d16f..44d9e43904 100644
--- a/usr/src/lib/libproc/common/Pcontrol.h
+++ b/usr/src/lib/libproc/common/Pcontrol.h
@@ -68,7 +68,7 @@ typedef struct {		/* symbol table */
 } sym_tbl_t;
 
 typedef struct file_info {	/* symbol information for a mapped file */
-	list_t	file_list;	/* linked list */
+	plist_t	file_list;	/* linked list */
 	char	file_pname[PRMAPSZ];	/* name from prmap_t */
 	struct map_info *file_map;	/* primary (text) mapping */
 	int	file_ref;	/* references from map_info_t structures */
@@ -102,7 +102,7 @@ typedef struct map_info {	/* description of an address space mapping */
 } map_info_t;
 
 typedef struct lwp_info {	/* per-lwp information from core file */
-	list_t	lwp_list;	/* linked list */
+	plist_t	lwp_list;	/* linked list */
 	lwpid_t	lwp_id;		/* lwp identifier */
 	lwpsinfo_t lwp_psinfo;	/* /proc/<pid>/lwp/<lwpid>/lwpsinfo data */
 	lwpstatus_t lwp_status;	/* /proc/<pid>/lwp/<lwpid>/lwpstatus data */
@@ -116,7 +116,7 @@ typedef struct lwp_info {	/* per-lwp information from core file */
 typedef struct core_info {	/* information specific to core files */
 	char core_dmodel;	/* data model for core file */
 	int core_errno;		/* error during initialization if != 0 */
-	list_t core_lwp_head;	/* head of list of lwp info */
+	plist_t core_lwp_head;	/* head of list of lwp info */
 	lwp_info_t *core_lwp;	/* current lwp information */
 	uint_t core_nlwp;	/* number of lwp's in list */
 	off64_t core_size;	/* size of core file in bytes */
@@ -171,7 +171,7 @@ struct ps_prochandle {
 	size_t	map_count;	/* number of mappings */
 	size_t	map_alloc;	/* number of mappings allocated */
 	uint_t	num_files;	/* number of file elements in file_info */
-	list_t	file_head;	/* head of mapped files w/ symbol table info */
+	plist_t	file_head;	/* head of mapped files w/ symbol table info */
 	char	*execname;	/* name of the executable file */
 	auxv_t	*auxv;		/* the process's aux vector */
 	int	nauxv;		/* number of aux vector entries */
@@ -228,6 +228,7 @@ extern	int	Padd_mapping(struct ps_prochandle *, off64_t, file_info_t *,
     prmap_t *);
 extern	void	Psort_mappings(struct ps_prochandle *);
 
+
 /*
  * Architecture-dependent definition of the breakpoint instruction.
  */
diff --git a/usr/src/lib/libproc/common/Putil.c b/usr/src/lib/libproc/common/Putil.c
index 7e06c14f67..791ec668cb 100644
--- a/usr/src/lib/libproc/common/Putil.c
+++ b/usr/src/lib/libproc/common/Putil.c
@@ -20,8 +20,8 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 1998-2001 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -41,8 +41,8 @@
 void
 list_link(void *new, void *existing)
 {
-	list_t *p = new;
-	list_t *q = existing;
+	plist_t *p = new;
+	plist_t *q = existing;
 
 	if (q) {
 		p->list_forw = q;
@@ -60,7 +60,7 @@ list_link(void *new, void *existing)
 void
 list_unlink(void *old)
 {
-	list_t *p = old;
+	plist_t *p = old;
 
 	if (p->list_forw != p) {
 		p->list_back->list_forw = p->list_forw;
diff --git a/usr/src/lib/libproc/common/Putil.h b/usr/src/lib/libproc/common/Putil.h
index 328440fc81..55ea45dba2 100644
--- a/usr/src/lib/libproc/common/Putil.h
+++ b/usr/src/lib/libproc/common/Putil.h
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -39,7 +39,7 @@ extern "C" {
 typedef struct P_list {
 	struct P_list	*list_forw;
 	struct P_list	*list_back;
-} list_t;
+} plist_t;
 
 /*
  * Routines to manipulate linked lists:
@@ -47,8 +47,8 @@ typedef struct P_list {
 extern void list_link(void *, void *);
 extern void list_unlink(void *);
 
-#define	list_next(elem)	(void *)(((list_t *)(elem))->list_forw)
-#define	list_prev(elem)	(void *)(((list_t *)(elem))->list_back)
+#define	list_next(elem)	(void *)(((plist_t *)(elem))->list_forw)
+#define	list_prev(elem)	(void *)(((plist_t *)(elem))->list_back)
 
 /*
  * Routines to manipulate sigset_t, fltset_t, or sysset_t.