diff options
author | Manfred Spraul <manfred@colorfullife.com> | 2008-07-25 04:48:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 13:53:42 -0400 |
commit | 2c0c29d414087f3b021059673c20a7088f5f1fff (patch) | |
tree | 713b226382814837840b0ed2a42b909dbb6cfaf9 | |
parent | 4daa28f6d8f5cda8ea0f55048e3c8811c384cbdd (diff) |
ipc/sem.c: remove unused entries from struct sem_queue
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>
Cc: Pierre Peiffer <peifferp@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/sem.h | 2 | ||||
-rw-r--r-- | ipc/sem.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/sem.h b/include/linux/sem.h index 6a1af1b49a13..87756ef1198e 100644 --- a/include/linux/sem.h +++ b/include/linux/sem.h | |||
@@ -107,8 +107,6 @@ struct sem_queue { | |||
107 | struct sem_undo * undo; /* undo structure */ | 107 | struct sem_undo * undo; /* undo structure */ |
108 | int pid; /* process id of requesting process */ | 108 | int pid; /* process id of requesting process */ |
109 | int status; /* completion status of operation */ | 109 | int status; /* completion status of operation */ |
110 | struct sem_array * sma; /* semaphore array for operations */ | ||
111 | int id; /* internal sem id */ | ||
112 | struct sembuf * sops; /* array of pending operations */ | 110 | struct sembuf * sops; /* array of pending operations */ |
113 | int nsops; /* number of operations */ | 111 | int nsops; /* number of operations */ |
114 | int alter; /* does the operation alter the array? */ | 112 | int alter; /* does the operation alter the array? */ |
@@ -1160,12 +1160,10 @@ asmlinkage long sys_semtimedop(int semid, struct sembuf __user *tsops, | |||
1160 | * task into the pending queue and go to sleep. | 1160 | * task into the pending queue and go to sleep. |
1161 | */ | 1161 | */ |
1162 | 1162 | ||
1163 | queue.sma = sma; | ||
1164 | queue.sops = sops; | 1163 | queue.sops = sops; |
1165 | queue.nsops = nsops; | 1164 | queue.nsops = nsops; |
1166 | queue.undo = un; | 1165 | queue.undo = un; |
1167 | queue.pid = task_tgid_vnr(current); | 1166 | queue.pid = task_tgid_vnr(current); |
1168 | queue.id = semid; | ||
1169 | queue.alter = alter; | 1167 | queue.alter = alter; |
1170 | if (alter) | 1168 | if (alter) |
1171 | append_to_queue(sma ,&queue); | 1169 | append_to_queue(sma ,&queue); |