xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch the rest of proc_ns_operations to working with &...->ns

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2014-11-01 00:25:30 -04:00
parent ff24870f46
commit 3c04118461
4 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ipc/namespace.c
View File

@@ -149,6 +149,11 @@ void put_ipc_ns(struct ipc_namespace *ns)
}
}
static inline struct ipc_namespace *to_ipc_ns(struct ns_common *ns)
{
return container_of(ns, struct ipc_namespace, ns);
}
static void *ipcns_get(struct task_struct *task)
{
struct ipc_namespace *ns = NULL;
@@ -160,17 +165,17 @@ static void *ipcns_get(struct task_struct *task)
ns = get_ipc_ns(nsproxy->ipc_ns);
task_unlock(task);
return ns;
return ns ? &ns->ns : NULL;
}
static void ipcns_put(void *ns)
{
return put_ipc_ns(ns);
return put_ipc_ns(to_ipc_ns(ns));
}
static int ipcns_install(struct nsproxy *nsproxy, void *new)
{
struct ipc_namespace *ns = new;
struct ipc_namespace *ns = to_ipc_ns(new);
if (!ns_capable(ns->user_ns, CAP_SYS_ADMIN) ||
!ns_capable(current_user_ns(), CAP_SYS_ADMIN))
return -EPERM;
@@ -184,9 +189,7 @@ static int ipcns_install(struct nsproxy *nsproxy, void *new)
static unsigned int ipcns_inum(void *vp)
{
struct ipc_namespace *ns = vp;
return ns->ns.inum;
return ((struct ns_common *)vp)->inum;
}
const struct proc_ns_operations ipcns_operations = {