Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 14:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

IPC/semaphores: consolidate SEM_STAT and IPC_STAT commands

Browse Source 
These commands (SEM_STAT and IPC_STAT) are rather doing the same things
(only the meaning of the id given as input and the return value differ).
However, for the semaphores, they are handled in two different places (two
different functions).

This patch consolidates this for clarification by handling these both
commands in the same place in semctl_nolock().  It also removes one unused
parameter for this function.

Signed-off-by: Pierre Peiffer <pierre.peiffer@bull.net>
Cc: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Pierre Peiffer 2008-02-08 04:18:56 -08:00 committed by Linus Torvalds
parent b2d75cddc8
commit 4b9fcb0ec6
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ipc/sem.c
View File

@ -617,7 +617,7 @@ static unsigned long copy_semid_to_user(void __user *buf, struct semid64_ds *in,
} }
} }
static int semctl_nolock(struct ipc_namespace *ns, int semid, int semnum, static int semctl_nolock(struct ipc_namespace *ns, int semid,
int cmd, int version, union semun arg) int cmd, int version, union semun arg)
{ {
int err = -EINVAL; int err = -EINVAL;
@ -657,14 +657,23 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid, int semnum,
return -EFAULT; return -EFAULT;
return (max_id < 0) ? 0: max_id; return (max_id < 0) ? 0: max_id;
} }
case IPC_STAT:
case SEM_STAT: case SEM_STAT:
{ {
struct semid64_ds tbuf; struct semid64_ds tbuf;
int id; int id;
if (cmd == SEM_STAT) {
sma = sem_lock(ns, semid); sma = sem_lock(ns, semid);
if (IS_ERR(sma)) if (IS_ERR(sma))
return PTR_ERR(sma); return PTR_ERR(sma);
id = sma->sem_perm.id;
} else {
sma = sem_lock_check(ns, semid);
if (IS_ERR(sma))
return PTR_ERR(sma);
id = 0;
}
err = -EACCES; err = -EACCES;
if (ipcperms (&sma->sem_perm, S_IRUGO)) if (ipcperms (&sma->sem_perm, S_IRUGO))
@ -674,8 +683,6 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid, int semnum,
if (err) if (err)
goto out_unlock; goto out_unlock;
id = sma->sem_perm.id;
memset(&tbuf, 0, sizeof(tbuf)); memset(&tbuf, 0, sizeof(tbuf));
kernel_to_ipc64_perm(&sma->sem_perm, &tbuf.sem_perm); kernel_to_ipc64_perm(&sma->sem_perm, &tbuf.sem_perm);
@ -810,19 +817,6 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
err = 0; err = 0;
goto out_unlock; goto out_unlock;
} }
case IPC_STAT:
{
struct semid64_ds tbuf;
memset(&tbuf,0,sizeof(tbuf));
kernel_to_ipc64_perm(&sma->sem_perm, &tbuf.sem_perm);
tbuf.sem_otime = sma->sem_otime;
tbuf.sem_ctime = sma->sem_ctime;
tbuf.sem_nsems = sma->sem_nsems;
sem_unlock(sma);
if (copy_semid_to_user (arg.buf, &tbuf, version))
return -EFAULT;
return 0;
}
/* GETVAL, GETPID, GETNCTN, GETZCNT, SETVAL: fall-through */ /* GETVAL, GETPID, GETNCTN, GETZCNT, SETVAL: fall-through */
} }
err = -EINVAL; err = -EINVAL;
@ -989,15 +983,15 @@ asmlinkage long sys_semctl (int semid, int semnum, int cmd, union semun arg)
switch(cmd) { switch(cmd) {
case IPC_INFO: case IPC_INFO:
case SEM_INFO: case SEM_INFO:
case IPC_STAT:
case SEM_STAT: case SEM_STAT:
err = semctl_nolock(ns,semid,semnum,cmd,version,arg); err = semctl_nolock(ns, semid, cmd, version, arg);
return err; return err;
case GETALL: case GETALL:
case GETVAL: case GETVAL:
case GETPID: case GETPID:
case GETNCNT: case GETNCNT:
case GETZCNT: case GETZCNT:
case IPC_STAT:
case SETVAL: case SETVAL:
case SETALL: case SETALL:
err = semctl_main(ns,semid,semnum,cmd,version,arg); err = semctl_main(ns,semid,semnum,cmd,version,arg);