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

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

ipc: drop ipcctl_pre_down 



Now that sem, msgque and shm, through *_down(), all use the lockless
variant of ipcctl_pre_down(), go ahead and delete it.

[akpm@linux-foundation.org: fix function name in kerneldoc, cleanups]
Signed-off-by: default avatarDavidlohr Bueso <davidlohr.bueso@hp.com>
Tested-by: default avatarSedat 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 79ccf0f8

ipc/util.c

+4 −20
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ int ipc_update_perm(struct ipc64_perm *in, struct kern_ipc_perm *out) 
}



/**

 * ipcctl_pre_down - retrieve an ipc and check permissions for some IPC_XXX cmd

 * ipcctl_pre_down_nolock - retrieve an ipc and check permissions for some IPC_XXX cmd

 * @ns:  the ipc namespace

 * @ids:  the table of ids where to look for the ipc

 * @id:   the id of the ipc to retrieve
@@ -746,26 +746,10 @@ int ipc_update_perm(struct ipc64_perm *in, struct kern_ipc_perm *out) 
 * It must be called without any lock held and

 *  - retrieves the ipc with the given id in the given table.

 *  - performs some audit and permission check, depending on the given cmd

 *  - returns the ipc with the ipc lock held in case of success

 *    or an err-code without any lock held otherwise.

 *  - returns a pointer to the ipc object or otherwise, the corresponding error.

 *

 * Call holding the both the rw_mutex and the rcu read lock.

 */

struct kern_ipc_perm *ipcctl_pre_down(struct ipc_namespace *ns,

				      struct ipc_ids *ids, int id, int cmd,

				      struct ipc64_perm *perm, int extra_perm)

{

	struct kern_ipc_perm *ipcp;



	ipcp = ipcctl_pre_down_nolock(ns, ids, id, cmd, perm, extra_perm);

	if (IS_ERR(ipcp))

		goto out;



	spin_lock(&ipcp->lock);

out:

	return ipcp;

}



struct kern_ipc_perm *ipcctl_pre_down_nolock(struct ipc_namespace *ns,

					struct ipc_ids *ids, int id, int cmd,

					struct ipc64_perm *perm, int extra_perm)

ipc/util.h

+0 −3
Original line number Diff line number Diff line
@@ -131,9 +131,6 @@ int ipc_update_perm(struct ipc64_perm *in, struct kern_ipc_perm *out); 
struct kern_ipc_perm *ipcctl_pre_down_nolock(struct ipc_namespace *ns,

					     struct ipc_ids *ids, int id, int cmd,

					     struct ipc64_perm *perm, int extra_perm);

struct kern_ipc_perm *ipcctl_pre_down(struct ipc_namespace *ns,

				      struct ipc_ids *ids, int id, int cmd,

				      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.  */