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

Commit 20b8875a authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Linus Torvalds
Browse files

ipc: drop ipc_lock_check 



No remaining users, we now use ipc_obtain_object_check().

Signed-off-by: default avatarDavidlohr Bueso <davidlohr.bueso@hp.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Rik van Riel <riel@redhat.com>
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 7a25dd9e

ipc/util.c

+0 −16
Original line number Diff line number Diff line
@@ -686,22 +686,6 @@ out: 
	return out;

}



struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id)

{

	struct kern_ipc_perm *out;



	out = ipc_lock(ids, id);

	if (IS_ERR(out))

		return out;



	if (ipc_checkid(out, id)) {

		ipc_unlock(out);

		return ERR_PTR(-EIDRM);

	}



	return out;

}



/**

 * ipcget - Common sys_*get() code

 * @ns : namsepace

ipc/util.h

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ static inline void ipc_unlock(struct kern_ipc_perm *perm) 
	rcu_read_unlock();

}



struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id);

struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id);

int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids,

			struct ipc_ops *ops, struct ipc_params *params);