This is just a cleanup, there is no functional change.
https://virtuozzo.atlassian.net/browse/VSTOR-118289
Signed-off-by: Pavel Tikhomirov <[email protected]>
Feature: ve: ve generic structures
---
drivers/tty/sysrq.c | 2 +-
fs/fs_context.c | 2 +-
fs/namespace.c | 2 +-
fs/nfsd/nfs4recover.c | 2 +-
kernel/ve/ve.c | 2 +-
net/core/dev.c | 4 ++--
net/netfilter/nf_conntrack_core.c | 4 ++--
net/netfilter/nf_conntrack_expect.c | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 10964b5e3fd37..3eaffc21d1fd7 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -1186,7 +1186,7 @@ static ssize_t write_sysrq_trigger(struct file *file,
const char __user *buf,
__handle_sysrq(c, false);
} else if (pnum > 0) {
printk("SysRq: CT#%s sent '%c' magic key.\n",
- cur->ve_name, c);
+ ve_name(cur), c);
pnum--;
}
}
diff --git a/fs/fs_context.c b/fs/fs_context.c
index 0ccc651276dea..76f34f3d468ea 100644
--- a/fs/fs_context.c
+++ b/fs/fs_context.c
@@ -300,7 +300,7 @@ int vfs_parse_fs_param_lazy(struct fs_context *fc, struct
fs_parameter *param)
*/
ve_pr_warn_ratelimited(VE0_LOG, "VE%s: can't do devmnt checks "
"for fstype %s (param key %s, param type %d)\n",
- ve->ve_name,
+ ve_name(ve),
fc->fs_type->name,
param->key,
param->type);
diff --git a/fs/namespace.c b/fs/namespace.c
index d29d070736254..62125faec55d2 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -3174,7 +3174,7 @@ int ve_devmnt_process(struct ve_struct *ve, dev_t dev,
void **data_pp, int remou
} else {
ve_pr_warn_ratelimited(VE_LOG_BOTH, "VE%s: no
allowed "
"mount options found for device
%u:%u\n",
- ve->ve_name, MAJOR(dev), MINOR(dev));
+ ve_name(ve), MAJOR(dev), MINOR(dev));
err = -EPERM;
}
} else
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 29f5b8eaa863a..563bac6305d7f 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -1892,7 +1892,7 @@ nfsd4_umh_cltrack_init(struct net *net)
if (!net_eq(net, ve_net)) {
rcu_read_unlock();
pr_warn("NFSD: attempt to initialize umh client tracking in
Container %s netns %u ignored.\n",
- get_exec_env()->ve_name, net->ns.inum);
+ ve_name(get_exec_env()), net->ns.inum);
kfree(grace_start);
return -EINVAL;
}
diff --git a/kernel/ve/ve.c b/kernel/ve/ve.c
index c04210bebb7e6..e66ba6fe1a633 100644
--- a/kernel/ve/ve.c
+++ b/kernel/ve/ve.c
@@ -609,7 +609,7 @@ static int ve_start_kthreadd(struct ve_struct *ve)
static int ve_workqueue_start(struct ve_struct *ve)
{
ve->wq = alloc_workqueue("ve_wq_%s", WQ_SYSFS|WQ_FREEZABLE|WQ_UNBOUND,
- 8, ve->ve_name);
+ 8, ve_name(ve));
if (!ve->wq)
return -ENOMEM;
diff --git a/net/core/dev.c b/net/core/dev.c
index 9bde69ad3c487..170d1763fa49c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -10429,7 +10429,7 @@ int register_netdevice(struct net_device *dev)
ve_pr_warn_ratelimited(VE_LOG_BOTH,
"CT%s: hits max number of network devices, "
"increase ve::netif_max_nr parameter\n",
- net->owner_ve->ve_name);
+ ve_name(net->owner_ve));
return ret;
}
@@ -11608,7 +11608,7 @@ int __dev_change_net_namespace(struct net_device *dev,
struct net *net,
ve_pr_warn_ratelimited(VE_LOG_BOTH,
"CT%s: hits max number of network devices, "
"increase ve::netif_max_nr parameter\n",
- net->owner_ve->ve_name);
+ ve_name(net->owner_ve));
goto out;
}
atomic_inc(&dev_net(dev)->owner_ve->netif_avail_nr);
diff --git a/net/netfilter/nf_conntrack_core.c
b/net/netfilter/nf_conntrack_core.c
index 36c1964f32339..1a7c5aee32f36 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1682,8 +1682,8 @@ __nf_conntrack_alloc(struct net *net,
conntrack_gc_work.early_drop = true;
atomic_dec(&cnet->count);
net_veboth_ratelimited(KERN_WARNING "VE%s: "
- "nf_conntrack table full,
dropping packet\n",
- net->owner_ve->ve_name);
+ "nf_conntrack table full,
dropping packet\n",
+ ve_name(net->owner_ve));
return ERR_PTR(-ENOMEM);
}
}
diff --git a/net/netfilter/nf_conntrack_expect.c
b/net/netfilter/nf_conntrack_expect.c
index 472538abc3dae..37334b6001e87 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -483,7 +483,7 @@ static inline int __nf_ct_expect_check(struct
nf_conntrack_expect *expect,
if (cnet->expect_count >= cnet->expect_max) {
net_veboth_ratelimited(KERN_WARNING "VE%s "
"nf_conntrack: expectation table
full\n",
- net->owner_ve->ve_name);
+ ve_name(net->owner_ve));
ret = -EMFILE;
}
out:
--
2.51.1
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
