ns: rename to __ns_ref
Make it easier to grep and rename to ns_count. Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
parent
b3d8ff0679
commit
024596a4e2
|
@ -6015,7 +6015,7 @@ struct mnt_namespace init_mnt_ns = {
|
|||
.ns.inum = PROC_MNT_INIT_INO,
|
||||
.ns.ops = &mntns_operations,
|
||||
.user_ns = &init_user_ns,
|
||||
.ns.count = REFCOUNT_INIT(1),
|
||||
.ns.__ns_ref = REFCOUNT_INIT(1),
|
||||
.passive = REFCOUNT_INIT(1),
|
||||
.mounts = RB_ROOT,
|
||||
.poll = __WAIT_QUEUE_HEAD_INITIALIZER(init_mnt_ns.poll),
|
||||
|
|
|
@ -29,7 +29,7 @@ struct ns_common {
|
|||
struct dentry *stashed;
|
||||
const struct proc_ns_operations *ops;
|
||||
unsigned int inum;
|
||||
refcount_t count;
|
||||
refcount_t __ns_ref; /* do not use directly */
|
||||
union {
|
||||
struct {
|
||||
u64 ns_id;
|
||||
|
@ -93,19 +93,19 @@ void __ns_common_free(struct ns_common *ns);
|
|||
|
||||
static __always_inline __must_check bool __ns_ref_put(struct ns_common *ns)
|
||||
{
|
||||
return refcount_dec_and_test(&ns->count);
|
||||
return refcount_dec_and_test(&ns->__ns_ref);
|
||||
}
|
||||
|
||||
static __always_inline __must_check bool __ns_ref_get(struct ns_common *ns)
|
||||
{
|
||||
return refcount_inc_not_zero(&ns->count);
|
||||
return refcount_inc_not_zero(&ns->__ns_ref);
|
||||
}
|
||||
|
||||
#define ns_ref_read(__ns) refcount_read(&to_ns_common((__ns))->count)
|
||||
#define ns_ref_inc(__ns) refcount_inc(&to_ns_common((__ns))->count)
|
||||
#define ns_ref_read(__ns) refcount_read(&to_ns_common((__ns))->__ns_ref)
|
||||
#define ns_ref_inc(__ns) refcount_inc(&to_ns_common((__ns))->__ns_ref)
|
||||
#define ns_ref_get(__ns) __ns_ref_get(to_ns_common((__ns)))
|
||||
#define ns_ref_put(__ns) __ns_ref_put(to_ns_common((__ns)))
|
||||
#define ns_ref_put_and_lock(__ns, __lock) \
|
||||
refcount_dec_and_lock(&to_ns_common((__ns))->count, (__lock))
|
||||
refcount_dec_and_lock(&to_ns_common((__ns))->__ns_ref, (__lock))
|
||||
|
||||
#endif
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <linux/utsname.h>
|
||||
|
||||
struct uts_namespace init_uts_ns = {
|
||||
.ns.count = REFCOUNT_INIT(2),
|
||||
.ns.__ns_ref = REFCOUNT_INIT(2),
|
||||
.name = {
|
||||
.sysname = UTS_SYSNAME,
|
||||
.nodename = UTS_NODENAME,
|
||||
|
|
|
@ -27,7 +27,7 @@ DEFINE_SPINLOCK(mq_lock);
|
|||
* and not CONFIG_IPC_NS.
|
||||
*/
|
||||
struct ipc_namespace init_ipc_ns = {
|
||||
.ns.count = REFCOUNT_INIT(1),
|
||||
.ns.__ns_ref = REFCOUNT_INIT(1),
|
||||
.user_ns = &init_user_ns,
|
||||
.ns.inum = PROC_IPC_INIT_INO,
|
||||
#ifdef CONFIG_IPC_NS
|
||||
|
|
|
@ -219,7 +219,7 @@ static bool have_favordynmods __ro_after_init = IS_ENABLED(CONFIG_CGROUP_FAVOR_D
|
|||
|
||||
/* cgroup namespace for init task */
|
||||
struct cgroup_namespace init_cgroup_ns = {
|
||||
.ns.count = REFCOUNT_INIT(2),
|
||||
.ns.__ns_ref = REFCOUNT_INIT(2),
|
||||
.user_ns = &init_user_ns,
|
||||
.ns.ops = &cgroupns_operations,
|
||||
.ns.inum = PROC_CGROUP_INIT_INO,
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
int __ns_common_init(struct ns_common *ns, const struct proc_ns_operations *ops, int inum)
|
||||
{
|
||||
refcount_set(&ns->count, 1);
|
||||
refcount_set(&ns->__ns_ref, 1);
|
||||
ns->stashed = NULL;
|
||||
ns->ops = ops;
|
||||
ns->ns_id = 0;
|
||||
|
|
|
@ -71,7 +71,7 @@ static int pid_max_max = PID_MAX_LIMIT;
|
|||
* the scheme scales to up to 4 million PIDs, runtime.
|
||||
*/
|
||||
struct pid_namespace init_pid_ns = {
|
||||
.ns.count = REFCOUNT_INIT(2),
|
||||
.ns.__ns_ref = REFCOUNT_INIT(2),
|
||||
.idr = IDR_INIT(init_pid_ns.idr),
|
||||
.pid_allocated = PIDNS_ADDING,
|
||||
.level = 0,
|
||||
|
|
|
@ -480,7 +480,7 @@ const struct proc_ns_operations timens_for_children_operations = {
|
|||
};
|
||||
|
||||
struct time_namespace init_time_ns = {
|
||||
.ns.count = REFCOUNT_INIT(3),
|
||||
.ns.__ns_ref = REFCOUNT_INIT(3),
|
||||
.user_ns = &init_user_ns,
|
||||
.ns.inum = PROC_TIME_INIT_INO,
|
||||
.ns.ops = &timens_operations,
|
||||
|
|
|
@ -65,7 +65,7 @@ struct user_namespace init_user_ns = {
|
|||
.nr_extents = 1,
|
||||
},
|
||||
},
|
||||
.ns.count = REFCOUNT_INIT(3),
|
||||
.ns.__ns_ref = REFCOUNT_INIT(3),
|
||||
.owner = GLOBAL_ROOT_UID,
|
||||
.group = GLOBAL_ROOT_GID,
|
||||
.ns.inum = PROC_USER_INIT_INO,
|
||||
|
|
Loading…
Reference in New Issue