CVS commit: src/sys

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Fri Sep  5 05:54:48 UTC 2014

Modified Files:
        src/sys/kern: sysv_sem.c
        src/sys/sys: sem.h

Log Message:
Don't nest struct undo and change it to sem_undo_entry


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/kern/sysv_sem.c
cvs rdiff -u -r1.29 -r1.30 src/sys/sys/sem.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/sysv_sem.c
diff -u src/sys/kern/sysv_sem.c:1.90 src/sys/kern/sysv_sem.c:1.91
--- src/sys/kern/sysv_sem.c:1.90	Tue Feb 25 18:30:11 2014
+++ src/sys/kern/sysv_sem.c	Fri Sep  5 05:54:48 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysv_sem.c,v 1.90 2014/02/25 18:30:11 pooka Exp $	*/
+/*	$NetBSD: sysv_sem.c,v 1.91 2014/09/05 05:54:48 matt Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_sem.c,v 1.90 2014/02/25 18:30:11 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_sem.c,v 1.91 2014/09/05 05:54:48 matt Exp $");
 
 #define SYSVSEM
 
@@ -344,7 +344,7 @@ semundo_adjust(struct proc *p, struct se
     int adjval)
 {
 	struct sem_undo *suptr;
-	struct undo *sunptr;
+	struct sem_undo_entry *sunptr;
 	int i;
 
 	KASSERT(mutex_owned(&semlock));
@@ -402,7 +402,7 @@ void
 semundo_clear(int semid, int semnum)
 {
 	struct sem_undo *suptr;
-	struct undo *sunptr, *sunend;
+	struct sem_undo_entry *sunptr, *sunend;
 
 	KASSERT(mutex_owned(&semlock));
 

Index: src/sys/sys/sem.h
diff -u src/sys/sys/sem.h:1.29 src/sys/sys/sem.h:1.30
--- src/sys/sys/sem.h:1.29	Mon Jan 19 19:39:41 2009
+++ src/sys/sys/sem.h	Fri Sep  5 05:54:48 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.h,v 1.29 2009/01/19 19:39:41 christos Exp $	*/
+/*	$NetBSD: sem.h,v 1.30 2014/09/05 05:54:48 matt Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -102,15 +102,17 @@ struct sembuf {
 /*
  * Undo structure (one per process)
  */
+struct sem_undo_entry {
+	short	un_adjval;	/* adjust on exit values */
+	short	un_num;		/* semaphore # */
+	int	un_id;		/* semid */
+};
+
 struct sem_undo {
 	struct	sem_undo *un_next;	/* ptr to next active undo structure */
 	struct	proc *un_proc;		/* owner of this structure */
 	short	un_cnt;			/* # of active entries */
-	struct undo {
-		short	un_adjval;	/* adjust on exit values */
-		short	un_num;		/* semaphore # */
-		int	un_id;		/* semid */
-	} un_ent[1];			/* undo entries */
+	struct	sem_undo_entry un_ent[1];/* undo entries */
 };
 #endif /* _KERNEL */
 
@@ -183,7 +185,7 @@ struct sem_sysctl_info {
 #endif
 
 /* actual size of an undo structure */
-#define SEMUSZ	(sizeof(struct sem_undo)+sizeof(struct undo)*SEMUME)
+#define SEMUSZ	(sizeof(struct sem_undo)+sizeof(struct sem_undo_entry)*SEMUME)
 
 /*
  * Structures allocated in machdep.c