mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
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: Manfred Spraul <[email protected]> Suggested-by: Li Bin <[email protected]> Cc: Joe Perches <[email protected]> Acked-by: Rafael Aquini <[email protected]> Cc: Davidlohr Bueso <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
72a8ff2f92
commit
239521f31d
11 changed files with 115 additions and 115 deletions
32
ipc/shm.c
32
ipc/shm.c
|
|
@ -67,7 +67,7 @@ static const struct vm_operations_struct shm_vm_ops;
|
|||
static int newseg(struct ipc_namespace *, struct ipc_params *);
|
||||
static void shm_open(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
|
||||
static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
|
||||
#endif
|
||||
|
|
@ -91,7 +91,7 @@ static void do_shm_rmid(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
|
|||
struct shmid_kernel *shp;
|
||||
shp = container_of(ipcp, struct shmid_kernel, shm_perm);
|
||||
|
||||
if (shp->shm_nattch){
|
||||
if (shp->shm_nattch) {
|
||||
shp->shm_perm.mode |= SHM_DEST;
|
||||
/* Do not find it any more */
|
||||
shp->shm_perm.key = IPC_PRIVATE;
|
||||
|
|
@ -116,7 +116,7 @@ static int __init ipc_ns_init(void)
|
|||
|
||||
pure_initcall(ipc_ns_init);
|
||||
|
||||
void __init shm_init (void)
|
||||
void __init shm_init(void)
|
||||
{
|
||||
ipc_init_proc_interface("sysvipc/shm",
|
||||
#if BITS_PER_LONG <= 32
|
||||
|
|
@ -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)
|
||||
{
|
||||
struct file * file = vma->vm_file;
|
||||
struct file *file = vma->vm_file;
|
||||
struct shm_file_data *sfd = shm_file_data(file);
|
||||
struct shmid_kernel *shp;
|
||||
struct ipc_namespace *ns = sfd->ns;
|
||||
|
|
@ -379,7 +379,7 @@ static struct mempolicy *shm_get_policy(struct vm_area_struct *vma,
|
|||
}
|
||||
#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);
|
||||
int ret;
|
||||
|
|
@ -486,7 +486,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
|
|||
int error;
|
||||
struct shmid_kernel *shp;
|
||||
size_t numpages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
|
||||
struct file * file;
|
||||
struct file *file;
|
||||
char name[13];
|
||||
int id;
|
||||
vm_flags_t acctflag = 0;
|
||||
|
|
@ -512,7 +512,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
|
|||
return error;
|
||||
}
|
||||
|
||||
sprintf (name, "SYSV%08x", key);
|
||||
sprintf(name, "SYSV%08x", key);
|
||||
if (shmflg & SHM_HUGETLB) {
|
||||
struct hstate *hs;
|
||||
size_t hugesize;
|
||||
|
|
@ -533,7 +533,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
|
|||
} else {
|
||||
/*
|
||||
* Do not allow no accounting for OVERCOMMIT_NEVER, even
|
||||
* if it's asked for.
|
||||
* if it's asked for.
|
||||
*/
|
||||
if ((shmflg & SHM_NORESERVE) &&
|
||||
sysctl_overcommit_memory != OVERCOMMIT_NEVER)
|
||||
|
|
@ -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)
|
||||
{
|
||||
switch(version) {
|
||||
switch (version) {
|
||||
case IPC_64:
|
||||
return copy_to_user(buf, in, sizeof(*in));
|
||||
case IPC_OLD:
|
||||
|
|
@ -655,7 +655,7 @@ static inline unsigned long copy_shmid_to_user(void __user *buf, struct shmid64_
|
|||
static inline unsigned long
|
||||
copy_shmid_from_user(struct shmid64_ds *out, void __user *buf, int version)
|
||||
{
|
||||
switch(version) {
|
||||
switch (version) {
|
||||
case IPC_64:
|
||||
if (copy_from_user(out, buf, sizeof(*out)))
|
||||
return -EFAULT;
|
||||
|
|
@ -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)
|
||||
{
|
||||
switch(version) {
|
||||
switch (version) {
|
||||
case IPC_64:
|
||||
return copy_to_user(buf, in, sizeof(*in));
|
||||
case IPC_OLD:
|
||||
{
|
||||
struct shminfo out;
|
||||
|
||||
if(in->shmmax > INT_MAX)
|
||||
if (in->shmmax > INT_MAX)
|
||||
out.shmmax = INT_MAX;
|
||||
else
|
||||
out.shmmax = (int)in->shmmax;
|
||||
|
|
@ -846,14 +846,14 @@ static int shmctl_nolock(struct ipc_namespace *ns, int shmid,
|
|||
shminfo.shmall = ns->shm_ctlall;
|
||||
|
||||
shminfo.shmmin = SHMMIN;
|
||||
if(copy_shminfo_to_user (buf, &shminfo, version))
|
||||
if (copy_shminfo_to_user(buf, &shminfo, version))
|
||||
return -EFAULT;
|
||||
|
||||
down_read(&shm_ids(ns).rwsem);
|
||||
err = ipc_get_maxid(&shm_ids(ns));
|
||||
up_read(&shm_ids(ns).rwsem);
|
||||
|
||||
if(err<0)
|
||||
if (err < 0)
|
||||
err = 0;
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -864,7 +864,7 @@ static int shmctl_nolock(struct ipc_namespace *ns, int shmid,
|
|||
memset(&shm_info, 0, sizeof(shm_info));
|
||||
down_read(&shm_ids(ns).rwsem);
|
||||
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.swap_attempts = 0;
|
||||
shm_info.swap_successes = 0;
|
||||
|
|
@ -1047,7 +1047,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
|
|||
struct shmid_kernel *shp;
|
||||
unsigned long addr;
|
||||
unsigned long size;
|
||||
struct file * file;
|
||||
struct file *file;
|
||||
int err;
|
||||
unsigned long flags;
|
||||
unsigned long prot;
|
||||
|
|
|
|||
Loading…
Reference in a new issue