Commit 941b0304 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

ipc: simplify rcu_read_lock() in semctl_nolock()

This trivially combines two rcu_read_lock() calls in both sides of a
if-statement into one single one in front of the if-statement.

Split out as an independent cleanup from the previous commit.
Acked-by: default avatarDavidlohr Bueso <>
Cc: Rik van Riel <>
Cc: Al Viro <>
Signed-off-by: default avatarLinus Torvalds <>
parent c728b9c8
......@@ -948,8 +948,8 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid,
memset(&tbuf, 0, sizeof(tbuf));
if (cmd == SEM_STAT) {
sma = sem_obtain_object(ns, semid);
if (IS_ERR(sma)) {
err = PTR_ERR(sma);
......@@ -957,7 +957,6 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid,
id = sma->;
} else {
sma = sem_obtain_object_check(ns, semid);
if (IS_ERR(sma)) {
err = PTR_ERR(sma);
Supports Markdown
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