Commit 239521f3 authored by Manfred Spraul's avatar Manfred Spraul Committed by Linus Torvalds

ipc: whitespace cleanup

The ipc code does not adhere the typical linux coding style.
This patch fixes lots of simple whitespace errors.

- mostly autogenerated by
  scripts/checkpatch.pl -f --fix \
	--types=pointer_location,spacing,space_before_tab
- one manual fixup (keep structure members tab-aligned)
- removal of additional space_before_tab that were not found by --fix

Tested with some of my msg and sem test apps.

Andrew: Could you include it in -mm and move it towards Linus' tree?
Signed-off-by: default avatarManfred Spraul <manfred@colorfullife.com>
Suggested-by: default avatarLi Bin <huawei.libin@huawei.com>
Cc: Joe Perches <joe@perches.com>
Acked-by: default avatarRafael Aquini <aquini@redhat.com>
Cc: Davidlohr Bueso <davidlohr@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 72a8ff2f
...@@ -9,7 +9,7 @@ struct msg_msg { ...@@ -9,7 +9,7 @@ struct msg_msg {
struct list_head m_list; struct list_head m_list;
long m_type; long m_type;
size_t m_ts; /* message text size */ size_t m_ts; /* message text size */
struct msg_msgseg* next; struct msg_msgseg *next;
void *security; void *security;
/* the actual message follows immediately */ /* the actual message follows immediately */
}; };
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
struct shmid_kernel /* private to the kernel */ struct shmid_kernel /* private to the kernel */
{ {
struct kern_ipc_perm shm_perm; struct kern_ipc_perm shm_perm;
struct file * shm_file; struct file *shm_file;
unsigned long shm_nattch; unsigned long shm_nattch;
unsigned long shm_segsz; unsigned long shm_segsz;
time_t shm_atim; time_t shm_atim;
......
...@@ -197,7 +197,7 @@ static inline int __put_compat_ipc_perm(struct ipc64_perm *p, ...@@ -197,7 +197,7 @@ static inline int __put_compat_ipc_perm(struct ipc64_perm *p,
static inline int get_compat_semid64_ds(struct semid64_ds *s64, static inline int get_compat_semid64_ds(struct semid64_ds *s64,
struct compat_semid64_ds __user *up64) struct compat_semid64_ds __user *up64)
{ {
if (!access_ok (VERIFY_READ, up64, sizeof(*up64))) if (!access_ok(VERIFY_READ, up64, sizeof(*up64)))
return -EFAULT; return -EFAULT;
return __get_compat_ipc64_perm(&s64->sem_perm, &up64->sem_perm); return __get_compat_ipc64_perm(&s64->sem_perm, &up64->sem_perm);
} }
...@@ -205,7 +205,7 @@ static inline int get_compat_semid64_ds(struct semid64_ds *s64, ...@@ -205,7 +205,7 @@ static inline int get_compat_semid64_ds(struct semid64_ds *s64,
static inline int get_compat_semid_ds(struct semid64_ds *s, static inline int get_compat_semid_ds(struct semid64_ds *s,
struct compat_semid_ds __user *up) struct compat_semid_ds __user *up)
{ {
if (!access_ok (VERIFY_READ, up, sizeof(*up))) if (!access_ok(VERIFY_READ, up, sizeof(*up)))
return -EFAULT; return -EFAULT;
return __get_compat_ipc_perm(&s->sem_perm, &up->sem_perm); return __get_compat_ipc_perm(&s->sem_perm, &up->sem_perm);
} }
...@@ -215,7 +215,7 @@ static inline int put_compat_semid64_ds(struct semid64_ds *s64, ...@@ -215,7 +215,7 @@ static inline int put_compat_semid64_ds(struct semid64_ds *s64,
{ {
int err; int err;
if (!access_ok (VERIFY_WRITE, up64, sizeof(*up64))) if (!access_ok(VERIFY_WRITE, up64, sizeof(*up64)))
return -EFAULT; return -EFAULT;
err = __put_compat_ipc64_perm(&s64->sem_perm, &up64->sem_perm); err = __put_compat_ipc64_perm(&s64->sem_perm, &up64->sem_perm);
err |= __put_user(s64->sem_otime, &up64->sem_otime); err |= __put_user(s64->sem_otime, &up64->sem_otime);
...@@ -229,7 +229,7 @@ static inline int put_compat_semid_ds(struct semid64_ds *s, ...@@ -229,7 +229,7 @@ static inline int put_compat_semid_ds(struct semid64_ds *s,
{ {
int err; int err;
if (!access_ok (VERIFY_WRITE, up, sizeof(*up))) if (!access_ok(VERIFY_WRITE, up, sizeof(*up)))
return -EFAULT; return -EFAULT;
err = __put_compat_ipc_perm(&s->sem_perm, &up->sem_perm); err = __put_compat_ipc_perm(&s->sem_perm, &up->sem_perm);
err |= __put_user(s->sem_otime, &up->sem_otime); err |= __put_user(s->sem_otime, &up->sem_otime);
...@@ -376,7 +376,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second, ...@@ -376,7 +376,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
struct compat_ipc_kludge ipck; struct compat_ipc_kludge ipck;
if (!uptr) if (!uptr)
return -EINVAL; return -EINVAL;
if (copy_from_user (&ipck, uptr, sizeof(ipck))) if (copy_from_user(&ipck, uptr, sizeof(ipck)))
return -EFAULT; return -EFAULT;
uptr = compat_ptr(ipck.msgp); uptr = compat_ptr(ipck.msgp);
fifth = ipck.msgtyp; fifth = ipck.msgtyp;
......
...@@ -64,7 +64,7 @@ asmlinkage long compat_sys_mq_open(const char __user *u_name, ...@@ -64,7 +64,7 @@ asmlinkage long compat_sys_mq_open(const char __user *u_name,
return sys_mq_open(u_name, oflag, mode, p); return sys_mq_open(u_name, oflag, mode, p);
} }
static int compat_prepare_timeout(struct timespec __user * *p, static int compat_prepare_timeout(struct timespec __user **p,
const struct compat_timespec __user *u) const struct compat_timespec __user *u)
{ {
struct timespec ts; struct timespec ts;
......
...@@ -164,21 +164,21 @@ static struct ctl_table ipc_kern_table[] = { ...@@ -164,21 +164,21 @@ static struct ctl_table ipc_kern_table[] = {
{ {
.procname = "shmmax", .procname = "shmmax",
.data = &init_ipc_ns.shm_ctlmax, .data = &init_ipc_ns.shm_ctlmax,
.maxlen = sizeof (init_ipc_ns.shm_ctlmax), .maxlen = sizeof(init_ipc_ns.shm_ctlmax),
.mode = 0644, .mode = 0644,
.proc_handler = proc_ipc_doulongvec_minmax, .proc_handler = proc_ipc_doulongvec_minmax,
}, },
{ {
.procname = "shmall", .procname = "shmall",
.data = &init_ipc_ns.shm_ctlall, .data = &init_ipc_ns.shm_ctlall,
.maxlen = sizeof (init_ipc_ns.shm_ctlall), .maxlen = sizeof(init_ipc_ns.shm_ctlall),
.mode = 0644, .mode = 0644,
.proc_handler = proc_ipc_doulongvec_minmax, .proc_handler = proc_ipc_doulongvec_minmax,
}, },
{ {
.procname = "shmmni", .procname = "shmmni",
.data = &init_ipc_ns.shm_ctlmni, .data = &init_ipc_ns.shm_ctlmni,
.maxlen = sizeof (init_ipc_ns.shm_ctlmni), .maxlen = sizeof(init_ipc_ns.shm_ctlmni),
.mode = 0644, .mode = 0644,
.proc_handler = proc_ipc_dointvec, .proc_handler = proc_ipc_dointvec,
}, },
...@@ -194,7 +194,7 @@ static struct ctl_table ipc_kern_table[] = { ...@@ -194,7 +194,7 @@ static struct ctl_table ipc_kern_table[] = {
{ {
.procname = "msgmax", .procname = "msgmax",
.data = &init_ipc_ns.msg_ctlmax, .data = &init_ipc_ns.msg_ctlmax,
.maxlen = sizeof (init_ipc_ns.msg_ctlmax), .maxlen = sizeof(init_ipc_ns.msg_ctlmax),
.mode = 0644, .mode = 0644,
.proc_handler = proc_ipc_dointvec_minmax, .proc_handler = proc_ipc_dointvec_minmax,
.extra1 = &zero, .extra1 = &zero,
...@@ -203,7 +203,7 @@ static struct ctl_table ipc_kern_table[] = { ...@@ -203,7 +203,7 @@ static struct ctl_table ipc_kern_table[] = {
{ {
.procname = "msgmni", .procname = "msgmni",
.data = &init_ipc_ns.msg_ctlmni, .data = &init_ipc_ns.msg_ctlmni,
.maxlen = sizeof (init_ipc_ns.msg_ctlmni), .maxlen = sizeof(init_ipc_ns.msg_ctlmni),
.mode = 0644, .mode = 0644,
.proc_handler = proc_ipc_callback_dointvec_minmax, .proc_handler = proc_ipc_callback_dointvec_minmax,
.extra1 = &zero, .extra1 = &zero,
...@@ -212,7 +212,7 @@ static struct ctl_table ipc_kern_table[] = { ...@@ -212,7 +212,7 @@ static struct ctl_table ipc_kern_table[] = {
{ {
.procname = "msgmnb", .procname = "msgmnb",
.data = &init_ipc_ns.msg_ctlmnb, .data = &init_ipc_ns.msg_ctlmnb,
.maxlen = sizeof (init_ipc_ns.msg_ctlmnb), .maxlen = sizeof(init_ipc_ns.msg_ctlmnb),
.mode = 0644, .mode = 0644,
.proc_handler = proc_ipc_dointvec_minmax, .proc_handler = proc_ipc_dointvec_minmax,
.extra1 = &zero, .extra1 = &zero,
...@@ -221,7 +221,7 @@ static struct ctl_table ipc_kern_table[] = { ...@@ -221,7 +221,7 @@ static struct ctl_table ipc_kern_table[] = {
{ {
.procname = "sem", .procname = "sem",
.data = &init_ipc_ns.sem_ctls, .data = &init_ipc_ns.sem_ctls,
.maxlen = 4*sizeof (int), .maxlen = 4*sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_ipc_dointvec, .proc_handler = proc_ipc_dointvec,
}, },
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Spinlocks: Mohamed Abbas (abbas.mohamed@intel.com) * Spinlocks: Mohamed Abbas (abbas.mohamed@intel.com)
* Lockless receive & send, fd based notify: * Lockless receive & send, fd based notify:
* Manfred Spraul (manfred@colorfullife.com) * Manfred Spraul (manfred@colorfullife.com)
* *
* Audit: George Wilson (ltcgcw@us.ibm.com) * Audit: George Wilson (ltcgcw@us.ibm.com)
* *
...@@ -73,7 +73,7 @@ struct mqueue_inode_info { ...@@ -73,7 +73,7 @@ struct mqueue_inode_info {
struct mq_attr attr; struct mq_attr attr;
struct sigevent notify; struct sigevent notify;
struct pid* notify_owner; struct pid *notify_owner;
struct user_namespace *notify_user_ns; struct user_namespace *notify_user_ns;
struct user_struct *user; /* user who created, for accounting */ struct user_struct *user; /* user who created, for accounting */
struct sock *notify_sock; struct sock *notify_sock;
...@@ -92,7 +92,7 @@ static void remove_notification(struct mqueue_inode_info *info); ...@@ -92,7 +92,7 @@ static void remove_notification(struct mqueue_inode_info *info);
static struct kmem_cache *mqueue_inode_cachep; static struct kmem_cache *mqueue_inode_cachep;
static struct ctl_table_header * mq_sysctl_table; static struct ctl_table_header *mq_sysctl_table;
static inline struct mqueue_inode_info *MQUEUE_I(struct inode *inode) static inline struct mqueue_inode_info *MQUEUE_I(struct inode *inode)
{ {
...@@ -466,13 +466,13 @@ static int mqueue_create(struct inode *dir, struct dentry *dentry, ...@@ -466,13 +466,13 @@ static int mqueue_create(struct inode *dir, struct dentry *dentry,
static int mqueue_unlink(struct inode *dir, struct dentry *dentry) static int mqueue_unlink(struct inode *dir, struct dentry *dentry)
{ {
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
dir->i_ctime = dir->i_mtime = dir->i_atime = CURRENT_TIME; dir->i_ctime = dir->i_mtime = dir->i_atime = CURRENT_TIME;
dir->i_size -= DIRENT_SIZE; dir->i_size -= DIRENT_SIZE;
drop_nlink(inode); drop_nlink(inode);
dput(dentry); dput(dentry);
return 0; return 0;
} }
/* /*
...@@ -622,7 +622,7 @@ static struct ext_wait_queue *wq_get_first_waiter( ...@@ -622,7 +622,7 @@ static struct ext_wait_queue *wq_get_first_waiter(
static inline void set_cookie(struct sk_buff *skb, char code) static inline void set_cookie(struct sk_buff *skb, char code)
{ {
((char*)skb->data)[NOTIFY_COOKIE_LEN-1] = code; ((char *)skb->data)[NOTIFY_COOKIE_LEN-1] = code;
} }
/* /*
......
...@@ -318,7 +318,7 @@ SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg) ...@@ -318,7 +318,7 @@ SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
static inline unsigned long static inline unsigned long
copy_msqid_to_user(void __user *buf, struct msqid64_ds *in, int version) copy_msqid_to_user(void __user *buf, struct msqid64_ds *in, int version)
{ {
switch(version) { switch (version) {
case IPC_64: case IPC_64:
return copy_to_user(buf, in, sizeof(*in)); return copy_to_user(buf, in, sizeof(*in));
case IPC_OLD: case IPC_OLD:
...@@ -363,7 +363,7 @@ copy_msqid_to_user(void __user *buf, struct msqid64_ds *in, int version) ...@@ -363,7 +363,7 @@ copy_msqid_to_user(void __user *buf, struct msqid64_ds *in, int version)
static inline unsigned long static inline unsigned long
copy_msqid_from_user(struct msqid64_ds *out, void __user *buf, int version) copy_msqid_from_user(struct msqid64_ds *out, void __user *buf, int version)
{ {
switch(version) { switch (version) {
case IPC_64: case IPC_64:
if (copy_from_user(out, buf, sizeof(*out))) if (copy_from_user(out, buf, sizeof(*out)))
return -EFAULT; return -EFAULT;
...@@ -375,9 +375,9 @@ copy_msqid_from_user(struct msqid64_ds *out, void __user *buf, int version) ...@@ -375,9 +375,9 @@ copy_msqid_from_user(struct msqid64_ds *out, void __user *buf, int version)
if (copy_from_user(&tbuf_old, buf, sizeof(tbuf_old))) if (copy_from_user(&tbuf_old, buf, sizeof(tbuf_old)))
return -EFAULT; return -EFAULT;
out->msg_perm.uid = tbuf_old.msg_perm.uid; out->msg_perm.uid = tbuf_old.msg_perm.uid;
out->msg_perm.gid = tbuf_old.msg_perm.gid; out->msg_perm.gid = tbuf_old.msg_perm.gid;
out->msg_perm.mode = tbuf_old.msg_perm.mode; out->msg_perm.mode = tbuf_old.msg_perm.mode;
if (tbuf_old.msg_qbytes == 0) if (tbuf_old.msg_qbytes == 0)
out->msg_qbytes = tbuf_old.msg_lqbytes; out->msg_qbytes = tbuf_old.msg_lqbytes;
...@@ -606,13 +606,13 @@ SYSCALL_DEFINE3(msgctl, int, msqid, int, cmd, struct msqid_ds __user *, buf) ...@@ -606,13 +606,13 @@ SYSCALL_DEFINE3(msgctl, int, msqid, int, cmd, struct msqid_ds __user *, buf)
static int testmsg(struct msg_msg *msg, long type, int mode) static int testmsg(struct msg_msg *msg, long type, int mode)
{ {
switch(mode) switch (mode)
{ {
case SEARCH_ANY: case SEARCH_ANY:
case SEARCH_NUMBER: case SEARCH_NUMBER:
return 1; return 1;
case SEARCH_LESSEQUAL: case SEARCH_LESSEQUAL:
if (msg->m_type <=type) if (msg->m_type <= type)
return 1; return 1;
break; break;
case SEARCH_EQUAL: case SEARCH_EQUAL:
...@@ -984,7 +984,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgfl ...@@ -984,7 +984,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgfl
* wake_up_process(). There is a race with exit(), see * wake_up_process(). There is a race with exit(), see
* ipc/mqueue.c for the details. * ipc/mqueue.c for the details.
*/ */
msg = (struct msg_msg*)msr_d.r_msg; msg = (struct msg_msg *)msr_d.r_msg;
while (msg == NULL) { while (msg == NULL) {
cpu_relax(); cpu_relax();
msg = (struct msg_msg *)msr_d.r_msg; msg = (struct msg_msg *)msr_d.r_msg;
...@@ -1005,7 +1005,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgfl ...@@ -1005,7 +1005,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgfl
/* Lockless receive, part 4: /* Lockless receive, part 4:
* Repeat test after acquiring the spinlock. * Repeat test after acquiring the spinlock.
*/ */
msg = (struct msg_msg*)msr_d.r_msg; msg = (struct msg_msg *)msr_d.r_msg;
if (msg != ERR_PTR(-EAGAIN)) if (msg != ERR_PTR(-EAGAIN))
goto out_unlock0; goto out_unlock0;
......
This diff is collapsed.
...@@ -67,7 +67,7 @@ static const struct vm_operations_struct shm_vm_ops; ...@@ -67,7 +67,7 @@ static const struct vm_operations_struct shm_vm_ops;
static int newseg(struct ipc_namespace *, struct ipc_params *); static int newseg(struct ipc_namespace *, struct ipc_params *);
static void shm_open(struct vm_area_struct *vma); static void shm_open(struct vm_area_struct *vma);
static void shm_close(struct vm_area_struct *vma); static void shm_close(struct vm_area_struct *vma);
static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp); static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static int sysvipc_shm_proc_show(struct seq_file *s, void *it); static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
#endif #endif
...@@ -91,7 +91,7 @@ static void do_shm_rmid(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp) ...@@ -91,7 +91,7 @@ static void do_shm_rmid(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
struct shmid_kernel *shp; struct shmid_kernel *shp;
shp = container_of(ipcp, struct shmid_kernel, shm_perm); shp = container_of(ipcp, struct shmid_kernel, shm_perm);
if (shp->shm_nattch){ if (shp->shm_nattch) {
shp->shm_perm.mode |= SHM_DEST; shp->shm_perm.mode |= SHM_DEST;
/* Do not find it any more */ /* Do not find it any more */
shp->shm_perm.key = IPC_PRIVATE; shp->shm_perm.key = IPC_PRIVATE;
...@@ -116,7 +116,7 @@ static int __init ipc_ns_init(void) ...@@ -116,7 +116,7 @@ static int __init ipc_ns_init(void)
pure_initcall(ipc_ns_init); pure_initcall(ipc_ns_init);
void __init shm_init (void) void __init shm_init(void)
{ {
ipc_init_proc_interface("sysvipc/shm", ipc_init_proc_interface("sysvipc/shm",
#if BITS_PER_LONG <= 32 #if BITS_PER_LONG <= 32
...@@ -248,7 +248,7 @@ static bool shm_may_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp) ...@@ -248,7 +248,7 @@ static bool shm_may_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
*/ */
static void shm_close(struct vm_area_struct *vma) static void shm_close(struct vm_area_struct *vma)
{ {
struct file * file = vma->vm_file; struct file *file = vma->vm_file;
struct shm_file_data *sfd = shm_file_data(file); struct shm_file_data *sfd = shm_file_data(file);
struct shmid_kernel *shp; struct shmid_kernel *shp;
struct ipc_namespace *ns = sfd->ns; struct ipc_namespace *ns = sfd->ns;
...@@ -379,7 +379,7 @@ static struct mempolicy *shm_get_policy(struct vm_area_struct *vma, ...@@ -379,7 +379,7 @@ static struct mempolicy *shm_get_policy(struct vm_area_struct *vma,
} }
#endif #endif
static int shm_mmap(struct file * file, struct vm_area_struct * vma) static int shm_mmap(struct file *file, struct vm_area_struct *vma)
{ {
struct shm_file_data *sfd = shm_file_data(file); struct shm_file_data *sfd = shm_file_data(file);
int ret; int ret;
...@@ -486,7 +486,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) ...@@ -486,7 +486,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
int error; int error;
struct shmid_kernel *shp; struct shmid_kernel *shp;
size_t numpages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; size_t numpages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
struct file * file; struct file *file;
char name[13]; char name[13];
int id; int id;
vm_flags_t acctflag = 0; vm_flags_t acctflag = 0;
...@@ -512,7 +512,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) ...@@ -512,7 +512,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
return error; return error;
} }
sprintf (name, "SYSV%08x", key); sprintf(name, "SYSV%08x", key);
if (shmflg & SHM_HUGETLB) { if (shmflg & SHM_HUGETLB) {
struct hstate *hs; struct hstate *hs;
size_t hugesize; size_t hugesize;
...@@ -533,7 +533,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) ...@@ -533,7 +533,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
} else { } else {
/* /*
* Do not allow no accounting for OVERCOMMIT_NEVER, even * Do not allow no accounting for OVERCOMMIT_NEVER, even
* if it's asked for. * if it's asked for.
*/ */
if ((shmflg & SHM_NORESERVE) && if ((shmflg & SHM_NORESERVE) &&
sysctl_overcommit_memory != OVERCOMMIT_NEVER) sysctl_overcommit_memory != OVERCOMMIT_NEVER)
...@@ -628,7 +628,7 @@ SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg) ...@@ -628,7 +628,7 @@ SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
static inline unsigned long copy_shmid_to_user(void __user *buf, struct shmid64_ds *in, int version) static inline unsigned long copy_shmid_to_user(void __user *buf, struct shmid64_ds *in, int version)
{ {
switch(version) { switch (version) {
case IPC_64: case IPC_64:
return copy_to_user(buf, in, sizeof(*in)); return copy_to_user(buf, in, sizeof(*in));
case IPC_OLD: case IPC_OLD:
...@@ -655,7 +655,7 @@ static inline unsigned long copy_shmid_to_user(void __user *buf, struct shmid64_ ...@@ -655,7 +655,7 @@ static inline unsigned long copy_shmid_to_user(void __user *buf, struct shmid64_
static inline unsigned long static inline unsigned long
copy_shmid_from_user(struct shmid64_ds *out, void __user *buf, int version) copy_shmid_from_user(struct shmid64_ds *out, void __user *buf, int version)
{ {
switch(version) { switch (version) {
case IPC_64: case IPC_64:
if (copy_from_user(out, buf, sizeof(*out))) if (copy_from_user(out, buf, sizeof(*out)))
return -EFAULT; return -EFAULT;
...@@ -680,14 +680,14 @@ copy_shmid_from_user(struct shmid64_ds *out, void __user *buf, int version) ...@@ -680,14 +680,14 @@ copy_shmid_from_user(struct shmid64_ds *out, void __user *buf, int version)
static inline unsigned long copy_shminfo_to_user(void __user *buf, struct shminfo64 *in, int version) static inline unsigned long copy_shminfo_to_user(void __user *buf, struct shminfo64 *in, int version)
{ {
switch(version) { switch (version) {
case IPC_64: case IPC_64:
return copy_to_user(buf, in, sizeof(*in)); return copy_to_user(buf, in, sizeof(*in));
case IPC_OLD: case IPC_OLD:
{ {
struct shminfo out; struct shminfo out;
if(in->shmmax > INT_MAX) if (in->shmmax > INT_MAX)
out.shmmax = INT_MAX; out.shmmax = INT_MAX;
else else
out.shmmax = (int)in->shmmax; out.shmmax = (int)in->shmmax;
...@@ -846,14 +846,14 @@ static int shmctl_nolock(struct ipc_namespace *ns, int shmid, ...@@ -846,14 +846,14 @@ static int shmctl_nolock(struct ipc_namespace *ns, int shmid,
shminfo.shmall = ns->shm_ctlall; shminfo.shmall = ns->shm_ctlall;
shminfo.shmmin = SHMMIN; shminfo.shmmin = SHMMIN;
if(copy_shminfo_to_user (buf, &shminfo, version)) if (copy_shminfo_to_user(buf, &shminfo, version))
return -EFAULT; return -EFAULT;
down_read(&shm_ids(ns).rwsem); down_read(&shm_ids(ns).rwsem);
err = ipc_get_maxid(&shm_ids(ns)); err = ipc_get_maxid(&shm_ids(ns));
up_read(&shm_ids(ns).rwsem); up_read(&shm_ids(ns).rwsem);
if(err<0) if (err < 0)
err = 0; err = 0;
goto out; goto out;
} }
...@@ -864,7 +864,7 @@ static int shmctl_nolock(struct ipc_namespace *ns, int shmid, ...@@ -864,7 +864,7 @@ static int shmctl_nolock(struct ipc_namespace *ns, int shmid,
memset(&shm_info, 0, sizeof(shm_info)); memset(&shm_info, 0, sizeof(shm_info));
down_read(&shm_ids(ns).rwsem); down_read(&shm_ids(ns).rwsem);
shm_info.used_ids = shm_ids(ns).in_use; shm_info.used_ids = shm_ids(ns).in_use;
shm_get_stat (ns, &shm_info.shm_rss, &shm_info.shm_swp); shm_get_stat(ns, &shm_info.shm_rss, &shm_info.shm_swp);
shm_info.shm_tot = ns->shm_tot; shm_info.shm_tot = ns->shm_tot;
shm_info.swap_attempts = 0; shm_info.swap_attempts = 0;
shm_info.swap_successes = 0; shm_info.swap_successes = 0;
...@@ -1047,7 +1047,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, ...@@ -1047,7 +1047,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
struct shmid_kernel *shp; struct shmid_kernel *shp;
unsigned long addr; unsigned long addr;
unsigned long size; unsigned long size;
struct file * file; struct file *file;
int err; int err;
unsigned long flags; unsigned long flags;
unsigned long prot; unsigned long prot;
......
...@@ -150,7 +150,7 @@ void ipc_init_ids(struct ipc_ids *ids) ...@@ -150,7 +150,7 @@ void ipc_init_ids(struct ipc_ids *ids)
if (seq_limit > USHRT_MAX) if (seq_limit > USHRT_MAX)
ids->seq_max = USHRT_MAX; ids->seq_max = USHRT_MAX;
else else
ids->seq_max = seq_limit; ids->seq_max = seq_limit;
} }
idr_init(&ids->ipcs_idr); idr_init(&ids->ipcs_idr);
...@@ -227,7 +227,7 @@ static struct kern_ipc_perm *ipc_findkey(struct ipc_ids *ids, key_t key) ...@@ -227,7 +227,7 @@ static struct kern_ipc_perm *ipc_findkey(struct ipc_ids *ids, key_t key)
} }
/** /**
* ipc_get_maxid - get the last assigned id * ipc_get_maxid - get the last assigned id
* @ids: IPC identifier set * @ids: IPC identifier set
* *
* Called with ipc_ids.rwsem held. * Called with ipc_ids.rwsem held.
...@@ -258,7 +258,7 @@ int ipc_get_maxid(struct ipc_ids *ids) ...@@ -258,7 +258,7 @@ int ipc_get_maxid(struct ipc_ids *ids)
} }
/** /**
* ipc_addid - add an IPC identifier * ipc_addid - add an IPC identifier
* @ids: IPC identifier set * @ids: IPC identifier set
* @new: new IPC permission set * @new: new IPC permission set
* @size: limit for the number of used ids * @size: limit for the number of used ids
...@@ -270,7 +270,7 @@ int ipc_get_maxid(struct ipc_ids *ids) ...@@ -270,7 +270,7 @@ int ipc_get_maxid(struct ipc_ids *ids)
* *
* Called with writer ipc_ids.rwsem held. * Called with writer ipc_ids.rwsem held.
*/ */
int ipc_addid(struct ipc_ids* ids, struct kern_ipc_perm* new, int size) int ipc_addid(struct ipc_ids *ids, struct kern_ipc_perm *new, int size)
{ {
kuid_t euid; kuid_t euid;
kgid_t egid; kgid_t egid;
...@@ -463,7 +463,7 @@ void ipc_rmid(struct ipc_ids *ids, struct kern_ipc_perm *ipcp) ...@@ -463,7 +463,7 @@ void ipc_rmid(struct ipc_ids *ids, struct kern_ipc_perm *ipcp)
void *ipc_alloc(int size) void *ipc_alloc(int size)
{ {
void *out; void *out;
if(size > PAGE_SIZE) if (size > PAGE_SIZE)
out = vmalloc(size); out = vmalloc(size);
else else
out = kmalloc(size, GFP_KERNEL); out = kmalloc(size, GFP_KERNEL);
...@@ -479,9 +479,9 @@ void *ipc_alloc(int size) ...@@ -479,9 +479,9 @@ void *ipc_alloc(int size)
* used in the allocation call. * used in the allocation call.
*/ */
void ipc_free(void* ptr, int size) void ipc_free(void *ptr, int size)
{ {
if(size > PAGE_SIZE) if (size > PAGE_SIZE)
vfree(ptr); vfree(ptr);
else else
kfree(ptr); kfree(ptr);
...@@ -542,7 +542,7 @@ void ipc_rcu_free(struct rcu_head *head) ...@@ -542,7 +542,7 @@ void ipc_rcu_free(struct rcu_head *head)
* Check user, group, other permissions for access * Check user, group, other permissions for access
* to ipc resources. return 0 if allowed * to ipc resources. return 0 if allowed
* *
* @flag will most probably be 0 or S_...UGO from <linux/stat.h> * @flag will most probably be 0 or S_...UGO from <linux/stat.h>
*/ */
int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag) int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
...@@ -581,7 +581,7 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag) ...@@ -581,7 +581,7 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
*/ */
void kernel_to_ipc64_perm (struct kern_ipc_perm *in, struct ipc64_perm *out) void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out)
{ {
out->key = in->key; out->key = in->key;
out->uid = from_kuid_munged(current_user_ns(), in->uid); out->uid = from_kuid_munged(current_user_ns(), in->uid);
...@@ -601,7 +601,7 @@ void kernel_to_ipc64_perm (struct kern_ipc_perm *in, struct ipc64_perm *out) ...@@ -601,7 +601,7 @@ void kernel_to_ipc64_perm (struct kern_ipc_perm *in, struct ipc64_perm *out)
* object and store it into the @out pointer. * object and store it into the @out pointer.
*/ */
void ipc64_perm_to_ipc_perm (struct ipc64_perm *in, struct ipc_perm *out) void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out)
{ {
out->key = in->key; out->key = in->key;
SET_UID(out->uid, in->uid); SET_UID(out->uid, in->uid);
...@@ -787,7 +787,7 @@ struct kern_ipc_perm *ipcctl_pre_down_nolock(struct ipc_namespace *ns, ...@@ -787,7 +787,7 @@ struct kern_ipc_perm *ipcctl_pre_down_nolock(struct ipc_namespace *ns,
* just the command code. * just the command code.
*/ */
int ipc_parse_version (int *cmd) int ipc_parse_version(int *cmd)
{ {
if (*cmd & IPC_64) { if (*cmd & IPC_64) {
*cmd ^= IPC_64; *cmd ^= IPC_64;
...@@ -824,7 +824,7 @@ static struct kern_ipc_perm *sysvipc_find_ipc(struct ipc_ids *ids, loff_t pos, ...@@ -824,7 +824,7 @@ static struct kern_ipc_perm *sysvipc_find_ipc(struct ipc_ids *ids, loff_t pos,
if (total >= ids->in_use) if (total >= ids->in_use)
return NULL; return NULL;
for ( ; pos < IPCMNI; pos++) { for (; pos < IPCMNI; pos++) {
ipc = idr_find(&ids->ipcs_idr, pos); ipc = idr_find(&ids->ipcs_idr, pos);
if (ipc != NULL) { if (ipc != NULL) {
*new_pos = pos + 1; *new_pos = pos + 1;
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#define SEQ_MULTIPLIER (IPCMNI) #define SEQ_MULTIPLIER (IPCMNI)
void sem_init (void); void sem_init(void);
void msg_init (void); void msg_init(void);
void shm_init (void); void shm_init(void);
struct ipc_namespace; struct ipc_namespace;
...@@ -116,8 +116,8 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flg); ...@@ -116,8 +116,8 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flg);
/* for rare, potentially huge allocations. /* for rare, potentially huge allocations.
* both function can sleep * both function can sleep
*/ */
void* ipc_alloc(int size); void *ipc_alloc(int size);
void ipc_free(void* ptr, int size); void ipc_free(void *ptr, int size);
/* /*
* For allocation that need to be freed by RCU. * For allocation that need to be freed by RCU.
...@@ -125,7 +125,7 @@ void ipc_free(void* ptr, int size); ...@@ -125,7 +125,7 @@ void ipc_free(void* ptr, int size);
* getref increases the refcount, the putref call that reduces the recount * getref increases the refcount, the putref call that reduces the recount
* to 0 schedules the rcu destruction. Caller must guarantee locking. * to 0 schedules the rcu destruction. Caller must guarantee locking.
*/ */
void* ipc_rcu_alloc(int size); void *ipc_rcu_alloc(int size);
int ipc_rcu_getref(void *ptr); int ipc_rcu_getref(void *ptr);
void ipc_rcu_putref(void *ptr, void (*func)(struct rcu_head *head)); void ipc_rcu_putref(void *ptr, void (*func)(struct rcu_head *head));
void ipc_rcu_free(struct rcu_head *head); void ipc_rcu_free(struct rcu_head *head);
...@@ -144,7 +144,7 @@ struct kern_ipc_perm *ipcctl_pre_down_nolock(struct ipc_namespace *ns, ...@@ -144,7 +144,7 @@ struct kern_ipc_perm *ipcctl_pre_down_nolock(struct ipc_namespace *ns,
/* 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 # define ipc_parse_version(cmd) IPC_64
#else #else
int ipc_parse_version (int *cmd); int ipc_parse_version(int *cmd);
#endif #endif
extern void free_msg(struct msg_msg *msg); extern void free_msg(struct msg_msg *msg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment