[PATCH 2/4] ipc/sem.c: remove unused entries from struct sem_queue

[PATCH 2/4] ipc/sem.c: remove unused entries from struct sem_queue

[Manfred Spraul]

sem_queue.sma and sem_queue.id were never used, the attached
patch removes them.

Signed-Off-By: Manfred Spraul <manfred@colorfullife.com>
---
 include/linux/sem.h |    2 --
 ipc/sem.c           |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/include/linux/sem.h b/include/linux/sem.h
index 6a1af1b..87756ef 100644
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
@@ -107,8 +107,6 @@ struct sem_queue {
 	struct sem_undo *	undo;	 /* undo structure */
 	int    			pid;	 /* process id of requesting process */
 	int    			status;	 /* completion status of operation */
-	struct sem_array *	sma;	 /* semaphore array for operations */
-	int			id;	 /* internal sem id */
 	struct sembuf *		sops;	 /* array of pending operations */
 	int			nsops;	 /* number of operations */
 	int			alter;   /* does the operation alter the array? */
diff --git a/ipc/sem.c b/ipc/sem.c
index 211632e..8cd96f1 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1160,12 +1160,10 @@ asmlinkage long sys_semtimedop(int semid, struct sembuf __user *tsops,
 	 * task into the pending queue and go to sleep.
 	 */
 		
-	queue.sma = sma;
 	queue.sops = sops;
 	queue.nsops = nsops;
 	queue.undo = un;
 	queue.pid = task_tgid_vnr(current);
-	queue.id = semid;
 	queue.alter = alter;
 	if (alter)
 		append_to_queue(sma ,&queue);
-- 
1.5.4.1

Re: [PATCH 2/4] ipc/sem.c: remove unused entries from struct sem_queue

[Nadia Derbey]

Manfred Spraul wrote:
> sem_queue.sma and sem_queue.id were never used, the attached
> patch removes them.
> 
> Signed-Off-By: Manfred Spraul <manfred@colorfullife.com>

Reviewed-By: Nadia Derbey <Nadia.Derbey@bull.net>

> ---
>  include/linux/sem.h |    2 --
>  ipc/sem.c           |    2 --
>  2 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/include/linux/sem.h b/include/linux/sem.h
> index 6a1af1b..87756ef 100644
> --- a/include/linux/sem.h
> +++ b/include/linux/sem.h
> @@ -107,8 +107,6 @@ struct sem_queue {
>  	struct sem_undo *	undo;	 /* undo structure */
>  	int    			pid;	 /* process id of requesting process */
>  	int    			status;	 /* completion status of operation */
> -	struct sem_array *	sma;	 /* semaphore array for operations */
> -	int			id;	 /* internal sem id */
>  	struct sembuf *		sops;	 /* array of pending operations */
>  	int			nsops;	 /* number of operations */
>  	int			alter;   /* does the operation alter the array? */
> diff --git a/ipc/sem.c b/ipc/sem.c
> index 211632e..8cd96f1 100644
> --- a/ipc/sem.c
> +++ b/ipc/sem.c
> @@ -1160,12 +1160,10 @@ asmlinkage long sys_semtimedop(int semid, struct sembuf __user *tsops,
>  	 * task into the pending queue and go to sleep.
>  	 */
>  		
> -	queue.sma = sma;
>  	queue.sops = sops;
>  	queue.nsops = nsops;
>  	queue.undo = un;
>  	queue.pid = task_tgid_vnr(current);
> -	queue.id = semid;
>  	queue.alter = alter;
>  	if (alter)
>  		append_to_queue(sma ,&queue);