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>

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>
Paul McQuade · Linus Torvalds
1 parent 7153e40273
Showing 6 changed files with 29 additions and 30 deletions Side-by-side Diff
ipc/msg.c
ipc/sem.c
ipc/shm.c
ipc/util.c
ipc/util.h
kernel/acct.c
@@ -611,23 +611,22 @@
  
 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;
 }
@@ -160,7 +160,7 @@
  *	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 @@
 		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 @@
 		}
 		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 @@
 	/* 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 @@
 			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 @@
 		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 @@
  * 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 @@
 	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 @@
  *      . 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 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 @@
 	spin_lock(&acct_lock);
 	if (file != acct->file) {
 		if (act)
-			res = act>0;
+			res = act > 0;
 		goto out;
 	}
  
@@ -262,7 +262,7 @@
 	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 {
...	...	@@ -611,23 +611,22 @@
611	611
612	612	static int testmsg(struct msg_msg *msg, long type, int mode)
613	613	{
614		- switch (mode)
615		- {
616		- case SEARCH_ANY:
617		- case SEARCH_NUMBER:
	614	+ switch (mode) {
	615	+ case SEARCH_ANY:
	616	+ case SEARCH_NUMBER:
	617	+ return 1;
	618	+ case SEARCH_LESSEQUAL:
	619	+ if (msg->m_type <= type)
618	620	return 1;
619		- case SEARCH_LESSEQUAL:
620		- if (msg->m_type <= type)
621		- return 1;
622		- break;
623		- case SEARCH_EQUAL:
624		- if (msg->m_type == type)
625		- return 1;
626		- break;
627		- case SEARCH_NOTEQUAL:
628		- if (msg->m_type != type)
629		- return 1;
630		- break;
	621	+ break;
	622	+ case SEARCH_EQUAL:
	623	+ if (msg->m_type == type)
	624	+ return 1;
	625	+ break;
	626	+ case SEARCH_NOTEQUAL:
	627	+ if (msg->m_type != type)
	628	+ return 1;
	629	+ break;
631	630	}
632	631	return 0;
633	632	}
...	...	@@ -160,7 +160,7 @@
160	160	* sem_array.pending{_alter,_cont},
161	161	* sem_array.sem_undo: global sem_lock() for read/write
162	162	* sem_undo.proc_next: only "current" is allowed to read/write that field.
163		- *
	163	+ *
164	164	* sem_array.sem_base[i].pending_{const,alter}:
165	165	* global or semaphore sem_lock() for read/write
166	166	*/
...	...	@@ -1161,7 +1161,7 @@
1161	1161	err = security_sem_semctl(NULL, cmd);
1162	1162	if (err)
1163	1163	return err;
1164		-
	1164	+
1165	1165	memset(&seminfo, 0, sizeof(seminfo));
1166	1166	seminfo.semmni = ns->sc_semmni;
1167	1167	seminfo.semmns = ns->sc_semmns;
...	...	@@ -1181,7 +1181,7 @@
1181	1181	}
1182	1182	max_id = ipc_get_maxid(&sem_ids(ns));
1183	1183	up_read(&sem_ids(ns).rwsem);
1184		- if (copy_to_user(p, &seminfo, sizeof(struct seminfo)))
	1184	+ if (copy_to_user(p, &seminfo, sizeof(struct seminfo)))
1185	1185	return -EFAULT;
1186	1186	return (max_id < 0) ? 0 : max_id;
1187	1187	}
...	...	@@ -1883,7 +1883,7 @@
1883	1883	/* We need to sleep on this operation, so we put the current
1884	1884	* task into the pending queue and go to sleep.
1885	1885	*/
1886		-
	1886	+
1887	1887	queue.sops = sops;
1888	1888	queue.nsops = nsops;
1889	1889	queue.undo = un;
...	...	@@ -2016,7 +2016,7 @@
2016	2016	return error;
2017	2017	atomic_inc(&undo_list->refcnt);
2018	2018	tsk->sysvsem.undo_list = undo_list;
2019		- } else
	2019	+ } else
2020	2020	tsk->sysvsem.undo_list = NULL;
2021	2021
2022	2022	return 0;
...	...	@@ -694,7 +694,7 @@
694	694	out.shmmin = in->shmmin;
695	695	out.shmmni = in->shmmni;
696	696	out.shmseg = in->shmseg;
697		- out.shmall = in->shmall;
	697	+ out.shmall = in->shmall;
698	698
699	699	return copy_to_user(buf, &out, sizeof(out));
700	700	}
...	...	@@ -183,7 +183,7 @@
183	183	* ipc_findkey - find a key in an ipc identifier set
184	184	* @ids: ipc identifier set
185	185	* @key: key to find
186		- *
	186	+ *
187	187	* Returns the locked pointer to the ipc structure if found or NULL
188	188	* otherwise. If key is found ipc points to the owning ipc structure
189	189	*
...	...	@@ -538,7 +538,7 @@
538	538	else if (in_group_p(ipcp->cgid) \|\| in_group_p(ipcp->gid))
539	539	granted_mode >>= 3;
540	540	/* is there some bit set in requested_mode but not in granted_mode? */
541		- if ((requested_mode & ~granted_mode & 0007) &&
	541	+ if ((requested_mode & ~granted_mode & 0007) &&
542	542	!ns_capable(ns->user_ns, CAP_IPC_OWNER))
543	543	return -1;
544	544
...	...	@@ -78,9 +78,9 @@
78	78	* . routine to call for an extra check if needed
79	79	*/
80	80	struct ipc_ops {
81		- int (getnew) (struct ipc_namespace , struct ipc_params *);
82		- int (associate) (struct kern_ipc_perm , int);
83		- int (more_checks) (struct kern_ipc_perm , struct ipc_params *);
	81	+ int (getnew)(struct ipc_namespace , struct ipc_params *);
	82	+ int (associate)(struct kern_ipc_perm , int);
	83	+ int (more_checks)(struct kern_ipc_perm , struct ipc_params *);
84	84	};
85	85
86	86	struct seq_file;
...	...	@@ -142,7 +142,7 @@
142	142	struct ipc64_perm *perm, int extra_perm);
143	143
144	144	#ifndef CONFIG_ARCH_WANT_IPC_PARSE_VERSION
145		- /* On IA-64, we always use the "64-bit version" of the IPC structures. */
	145	+/* On IA-64, we always use the "64-bit version" of the IPC structures. */
146	146	# define ipc_parse_version(cmd) IPC_64
147	147	#else
148	148	int ipc_parse_version(int *cmd);
...	...	@@ -134,7 +134,7 @@
134	134	spin_lock(&acct_lock);
135	135	if (file != acct->file) {
136	136	if (act)
137		- res = act>0;
	137	+ res = act > 0;
138	138	goto out;
139	139	}
140	140
...	...	@@ -262,7 +262,7 @@
262	262	if (name) {
263	263	struct filename *tmp = getname(name);
264	264	if (IS_ERR(tmp))
265		- return (PTR_ERR(tmp));
	265	+ return PTR_ERR(tmp);
266	266	error = acct_on(tmp);
267	267	putname(tmp);
268	268	} else {