Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4de85cd6 authored by Julia Lawall's avatar Julia Lawall Committed by Linus Torvalds
Browse files

ipc/sem.c: use ERR_CAST 

Use ERR_CAST(x) rather than ERR_PTR(PTR_ERR(x)).  The former makes more
clear what is the purpose of the operation, which otherwise looks like a
no-op.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@@
type T;
T x;
identifier f;
@@

T f (...) { <+...
- ERR_PTR(PTR_ERR(x))
+ x
 ...+> }

@@
expression x;
@@

- ERR_PTR(PTR_ERR(x))
+ ERR_CAST(x)
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Cc: Manfred 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 c5cf6359

ipc/sem.c

+1 −1
Original line number Diff line number Diff line
@@ -1208,7 +1208,7 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid) 
	/* step 1: figure out the size of the semaphore array */

	sma = sem_lock_check(ns, semid);

	if (IS_ERR(sma))

		return ERR_PTR(PTR_ERR(sma));

		return ERR_CAST(sma);



	nsems = sma->sem_nsems;

	sem_getref_and_unlock(sma);