forked from luck/tmp_suning_uos_patched
ipc, kernel: clear whitespace
trailing whitespace Signed-off-by: Paul McQuade <paulmcquad@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
7153e40273
commit
46c0a8ca3e
31
ipc/msg.c
31
ipc/msg.c
|
@ -611,23 +611,22 @@ SYSCALL_DEFINE3(msgctl, int, msqid, int, cmd, struct msqid_ds __user *, buf)
|
|||
|
||||
static int testmsg(struct msg_msg *msg, long type, int mode)
|
||||
{
|
||||
switch (mode)
|
||||
{
|
||||
case SEARCH_ANY:
|
||||
case SEARCH_NUMBER:
|
||||
switch (mode) {
|
||||
case SEARCH_ANY:
|
||||
case SEARCH_NUMBER:
|
||||
return 1;
|
||||
case SEARCH_LESSEQUAL:
|
||||
if (msg->m_type <= type)
|
||||
return 1;
|
||||
case SEARCH_LESSEQUAL:
|
||||
if (msg->m_type <= type)
|
||||
return 1;
|
||||
break;
|
||||
case SEARCH_EQUAL:
|
||||
if (msg->m_type == type)
|
||||
return 1;
|
||||
break;
|
||||
case SEARCH_NOTEQUAL:
|
||||
if (msg->m_type != type)
|
||||
return 1;
|
||||
break;
|
||||
break;
|
||||
case SEARCH_EQUAL:
|
||||
if (msg->m_type == type)
|
||||
return 1;
|
||||
break;
|
||||
case SEARCH_NOTEQUAL:
|
||||
if (msg->m_type != type)
|
||||
return 1;
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
10
ipc/sem.c
10
ipc/sem.c
|
@ -160,7 +160,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it);
|
|||
* sem_array.pending{_alter,_cont},
|
||||
* sem_array.sem_undo: global sem_lock() for read/write
|
||||
* sem_undo.proc_next: only "current" is allowed to read/write that field.
|
||||
*
|
||||
*
|
||||
* sem_array.sem_base[i].pending_{const,alter}:
|
||||
* global or semaphore sem_lock() for read/write
|
||||
*/
|
||||
|
@ -1161,7 +1161,7 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid,
|
|||
err = security_sem_semctl(NULL, cmd);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
|
||||
memset(&seminfo, 0, sizeof(seminfo));
|
||||
seminfo.semmni = ns->sc_semmni;
|
||||
seminfo.semmns = ns->sc_semmns;
|
||||
|
@ -1181,7 +1181,7 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid,
|
|||
}
|
||||
max_id = ipc_get_maxid(&sem_ids(ns));
|
||||
up_read(&sem_ids(ns).rwsem);
|
||||
if (copy_to_user(p, &seminfo, sizeof(struct seminfo)))
|
||||
if (copy_to_user(p, &seminfo, sizeof(struct seminfo)))
|
||||
return -EFAULT;
|
||||
return (max_id < 0) ? 0 : max_id;
|
||||
}
|
||||
|
@ -1883,7 +1883,7 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
|
|||
/* We need to sleep on this operation, so we put the current
|
||||
* task into the pending queue and go to sleep.
|
||||
*/
|
||||
|
||||
|
||||
queue.sops = sops;
|
||||
queue.nsops = nsops;
|
||||
queue.undo = un;
|
||||
|
@ -2016,7 +2016,7 @@ int copy_semundo(unsigned long clone_flags, struct task_struct *tsk)
|
|||
return error;
|
||||
atomic_inc(&undo_list->refcnt);
|
||||
tsk->sysvsem.undo_list = undo_list;
|
||||
} else
|
||||
} else
|
||||
tsk->sysvsem.undo_list = NULL;
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -694,7 +694,7 @@ static inline unsigned long copy_shminfo_to_user(void __user *buf, struct shminf
|
|||
out.shmmin = in->shmmin;
|
||||
out.shmmni = in->shmmni;
|
||||
out.shmseg = in->shmseg;
|
||||
out.shmall = in->shmall;
|
||||
out.shmall = in->shmall;
|
||||
|
||||
return copy_to_user(buf, &out, sizeof(out));
|
||||
}
|
||||
|
|
|
@ -183,7 +183,7 @@ void __init ipc_init_proc_interface(const char *path, const char *header,
|
|||
* ipc_findkey - find a key in an ipc identifier set
|
||||
* @ids: ipc identifier set
|
||||
* @key: key to find
|
||||
*
|
||||
*
|
||||
* Returns the locked pointer to the ipc structure if found or NULL
|
||||
* otherwise. If key is found ipc points to the owning ipc structure
|
||||
*
|
||||
|
@ -538,7 +538,7 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
|
|||
else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
|
||||
granted_mode >>= 3;
|
||||
/* is there some bit set in requested_mode but not in granted_mode? */
|
||||
if ((requested_mode & ~granted_mode & 0007) &&
|
||||
if ((requested_mode & ~granted_mode & 0007) &&
|
||||
!ns_capable(ns->user_ns, CAP_IPC_OWNER))
|
||||
return -1;
|
||||
|
||||
|
|
|
@ -78,9 +78,9 @@ struct ipc_params {
|
|||
* . routine to call for an extra check if needed
|
||||
*/
|
||||
struct ipc_ops {
|
||||
int (*getnew) (struct ipc_namespace *, struct ipc_params *);
|
||||
int (*associate) (struct kern_ipc_perm *, int);
|
||||
int (*more_checks) (struct kern_ipc_perm *, struct ipc_params *);
|
||||
int (*getnew)(struct ipc_namespace *, struct ipc_params *);
|
||||
int (*associate)(struct kern_ipc_perm *, int);
|
||||
int (*more_checks)(struct kern_ipc_perm *, struct ipc_params *);
|
||||
};
|
||||
|
||||
struct seq_file;
|
||||
|
@ -142,7 +142,7 @@ struct kern_ipc_perm *ipcctl_pre_down_nolock(struct ipc_namespace *ns,
|
|||
struct ipc64_perm *perm, int extra_perm);
|
||||
|
||||
#ifndef CONFIG_ARCH_WANT_IPC_PARSE_VERSION
|
||||
/* On IA-64, we always use the "64-bit version" of the IPC structures. */
|
||||
/* On IA-64, we always use the "64-bit version" of the IPC structures. */
|
||||
# define ipc_parse_version(cmd) IPC_64
|
||||
#else
|
||||
int ipc_parse_version(int *cmd);
|
||||
|
|
|
@ -134,7 +134,7 @@ static int check_free_space(struct bsd_acct_struct *acct, struct file *file)
|
|||
spin_lock(&acct_lock);
|
||||
if (file != acct->file) {
|
||||
if (act)
|
||||
res = act>0;
|
||||
res = act > 0;
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -262,7 +262,7 @@ SYSCALL_DEFINE1(acct, const char __user *, name)
|
|||
if (name) {
|
||||
struct filename *tmp = getname(name);
|
||||
if (IS_ERR(tmp))
|
||||
return (PTR_ERR(tmp));
|
||||
return PTR_ERR(tmp);
|
||||
error = acct_on(tmp);
|
||||
putname(tmp);
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue
Block a user