The commit is pushed to "branch-rh7-3.10.0-229.7.2.vz7.9.x-ovz" and will appear
at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-229.7.2.vz7.9.29
------>
commit 15266e1db02fe8a7ba0d8473a85af38d77099b8e
Author: Stanislav Kinsburskiy <[email protected]>
Date: Thu Jan 28 20:01:53 2016 +0400
ve/nfsd: do not print nfscld warning in a container
https://jira.sw.ru/browse/PSBM-43468
Signed-off-by: Stanislav Kinsburskiy <[email protected]>
---
fs/nfsd/nfs4recover.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 0577c56..6ccebc4 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -1290,9 +1290,12 @@ nfsd4_client_tracking_init(struct net *net)
/* Finally, try to use nfsdcld */
nn->client_tracking_ops = &nfsd4_cld_tracking_ops;
- printk(KERN_WARNING "NFSD: the nfsdcld client tracking upcall will be "
- "removed in 3.10. Please transition to using "
- "nfsdcltrack.\n");
+
+ if (net_eq(net, &init_net)) {
+ printk(KERN_WARNING "NFSD: the nfsdcld client tracking upcall
will be "
+ "removed in 3.10. Please transition to using "
+ "nfsdcltrack.\n");
+ }
do_init:
status = nn->client_tracking_ops->init(net);
if (status) {
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
