| Message ID | 159611037654.535980.11569207616830163621.stgit@localhost.localdomain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | proc: Introduce /proc/namespaces/ directory to expose namespaces lineary | expand |
On Thu, Jul 30, 2020 at 02:59:36PM +0300, Kirill Tkhai wrote: > Convert uts namespace to use generic counter. > > Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> > --- Acked-by: Christian Brauner <christian.brauner@ubuntu.com> > include/linux/ipc_namespace.h | 3 +-- > ipc/msgutil.c | 2 +- > ipc/namespace.c | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h > index a06a78c67f19..05e22770af51 100644 > --- a/include/linux/ipc_namespace.h > +++ b/include/linux/ipc_namespace.h > @@ -27,7 +27,6 @@ struct ipc_ids { > }; > > struct ipc_namespace { > - refcount_t count; > struct ipc_ids ids[3]; > > int sem_ctls[4]; > @@ -128,7 +127,7 @@ extern struct ipc_namespace *copy_ipcs(unsigned long flags, > static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) > { > if (ns) > - refcount_inc(&ns->count); > + refcount_inc(&ns->ns.count); > return ns; > } > > diff --git a/ipc/msgutil.c b/ipc/msgutil.c > index 3149b4a379de..d0a0e877cadd 100644 > --- a/ipc/msgutil.c > +++ b/ipc/msgutil.c > @@ -26,7 +26,7 @@ DEFINE_SPINLOCK(mq_lock); > * and not CONFIG_IPC_NS. > */ > struct ipc_namespace init_ipc_ns = { > - .count = REFCOUNT_INIT(1), > + .ns.count = REFCOUNT_INIT(1), > .user_ns = &init_user_ns, > .ns.inum = PROC_IPC_INIT_INO, > #ifdef CONFIG_IPC_NS > diff --git a/ipc/namespace.c b/ipc/namespace.c > index 24e7b45320f7..7bd0766ddc3b 100644 > --- a/ipc/namespace.c > +++ b/ipc/namespace.c > @@ -51,7 +51,7 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns, > goto fail_free; > ns->ns.ops = &ipcns_operations; > > - refcount_set(&ns->count, 1); > + refcount_set(&ns->ns.count, 1); > ns->user_ns = get_user_ns(user_ns); > ns->ucounts = ucounts; > > @@ -164,7 +164,7 @@ static DECLARE_WORK(free_ipc_work, free_ipc); > */ > void put_ipc_ns(struct ipc_namespace *ns) > { > - if (refcount_dec_and_lock(&ns->count, &mq_lock)) { > + if (refcount_dec_and_lock(&ns->ns.count, &mq_lock)) { > mq_clear_sbinfo(ns); > spin_unlock(&mq_lock); > > >
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index a06a78c67f19..05e22770af51 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h @@ -27,7 +27,6 @@ struct ipc_ids { }; struct ipc_namespace { - refcount_t count; struct ipc_ids ids[3]; int sem_ctls[4]; @@ -128,7 +127,7 @@ extern struct ipc_namespace *copy_ipcs(unsigned long flags, static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) { if (ns) - refcount_inc(&ns->count); + refcount_inc(&ns->ns.count); return ns; } diff --git a/ipc/msgutil.c b/ipc/msgutil.c index 3149b4a379de..d0a0e877cadd 100644 --- a/ipc/msgutil.c +++ b/ipc/msgutil.c @@ -26,7 +26,7 @@ DEFINE_SPINLOCK(mq_lock); * and not CONFIG_IPC_NS. */ struct ipc_namespace init_ipc_ns = { - .count = REFCOUNT_INIT(1), + .ns.count = REFCOUNT_INIT(1), .user_ns = &init_user_ns, .ns.inum = PROC_IPC_INIT_INO, #ifdef CONFIG_IPC_NS diff --git a/ipc/namespace.c b/ipc/namespace.c index 24e7b45320f7..7bd0766ddc3b 100644 --- a/ipc/namespace.c +++ b/ipc/namespace.c @@ -51,7 +51,7 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns, goto fail_free; ns->ns.ops = &ipcns_operations; - refcount_set(&ns->count, 1); + refcount_set(&ns->ns.count, 1); ns->user_ns = get_user_ns(user_ns); ns->ucounts = ucounts; @@ -164,7 +164,7 @@ static DECLARE_WORK(free_ipc_work, free_ipc); */ void put_ipc_ns(struct ipc_namespace *ns) { - if (refcount_dec_and_lock(&ns->count, &mq_lock)) { + if (refcount_dec_and_lock(&ns->ns.count, &mq_lock)) { mq_clear_sbinfo(ns); spin_unlock(&mq_lock);
Convert uts namespace to use generic counter. Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> --- include/linux/ipc_namespace.h | 3 +-- ipc/msgutil.c | 2 +- ipc/namespace.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-)