Commit 3ab08fe2 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Linus Torvalds
Browse files

ipc: remove braces for single statements 



Deal with checkpatch messages:
     WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: default avatarDavidlohr Bueso <davidlohr@hp.com>
Cc: Aswin Chandramouleeswaran <aswin@hp.com>
Cc: Rik van Riel <riel@redhat.com>
Acked-by: default avatarManfred Spraul <manfred@colorfullife.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8001c858

ipc/compat.c

+9 −9
Original line number Diff line number Diff line
@@ -288,11 +288,11 @@ static long do_compat_semctl(int first, int second, int third, u32 pad) 
		break;



	case IPC_SET:

		if (version == IPC_64) {

		if (version == IPC_64)

			err = get_compat_semid64_ds(&s64, compat_ptr(pad));

		} else {

		else

			err = get_compat_semid_ds(&s64, compat_ptr(pad));

		}



		up64 = compat_alloc_user_space(sizeof(s64));

		if (copy_to_user(up64, &s64, sizeof(s64)))

			err = -EFAULT;
@@ -515,11 +515,11 @@ long compat_sys_msgctl(int first, int second, void __user *uptr) 
		break;



	case IPC_SET:

		if (version == IPC_64) {

		if (version == IPC_64)

			err = get_compat_msqid64(&m64, uptr);

		} else {

		else

			err = get_compat_msqid(&m64, uptr);

		}



		if (err)

			break;

		p = compat_alloc_user_space(sizeof(m64));
@@ -702,11 +702,11 @@ long compat_sys_shmctl(int first, int second, void __user *uptr) 




	case IPC_SET:

		if (version == IPC_64) {

		if (version == IPC_64)

			err = get_compat_shmid64_ds(&s64, uptr);

		} else {

		else

			err = get_compat_shmid_ds(&s64, uptr);

		}



		if (err)

			break;

		p = compat_alloc_user_space(sizeof(s64));

ipc/mqueue.c

+3 −3
Original line number Diff line number Diff line
@@ -1303,11 +1303,11 @@ retry: 
out_fput:

	fdput(f);

out:

	if (sock) {

	if (sock)

		netlink_detachskb(sock, nc);

	} else if (nc) {

	else if (nc)

		dev_kfree_skb(nc);

	}



	return ret;

}

ipc/sem.c

+3 −5
Original line number Diff line number Diff line
@@ -492,9 +492,9 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params) 


	size = sizeof(*sma) + nsems * sizeof(struct sem);

	sma = ipc_rcu_alloc(size);

	if (!sma) {

	if (!sma)

		return -ENOMEM;

	}



	memset(sma, 0, size);



	sma->sem_perm.mode = (semflg & S_IRWXUGO);
@@ -1967,10 +1967,8 @@ sleep_again: 
	 * If queue.status != -EINTR we are woken up by another process.

	 * Leave without unlink_queue(), but with sem_unlock().

	 */



	if (error != -EINTR) {

	if (error != -EINTR)

		goto out_unlock_free;

	}



	/*

	 * If an interrupt occurred we have to clean up the queue

ipc/util.c

+1 −2
Original line number Diff line number Diff line
@@ -183,10 +183,9 @@ void __init ipc_init_proc_interface(const char *path, const char *header, 
			       NULL,           /* parent dir */

			       &sysvipc_proc_fops,

			       iface);

	if (!pde) {

	if (!pde)

		kfree(iface);

}

}

#endif



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE