aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2015-08-25 16:59:16 -0400
committerJ. Bruce Fields <bfields@redhat.com>2015-08-31 16:32:08 -0400
commit46cc8ba30445025f0ed3ed9f429aea573b301122 (patch)
treeb272f2fd04aa3b74f594522a2247da6263f695ad
parent7fadc59cc89f207ff6ca3d0951e11265fb4f806e (diff)
nfsd: don't WARN/backtrace for invalid container deployment.
These messages, combined with the backtrace they trigger, makes it seem like a serious problem, though a quick search shows distros marking it as a "won't fix" non-issue when the problem is reported by users. The backtrace is overkill, and only really manages to show that if you follow the code path, you can't really avoid it with bootargs or configuration settings in the container. Given that, lets tone it down a bit and get rid of the WARN severity, and the associated backtrace, so people aren't needlessly alarmed. Also, lets drop the split printk line, since they are grep unfriendly. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/nfs4recover.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 591bfbdf0316..e3d47091b191 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -547,8 +547,7 @@ nfsd4_legacy_tracking_init(struct net *net)
547 547
548 /* XXX: The legacy code won't work in a container */ 548 /* XXX: The legacy code won't work in a container */
549 if (net != &init_net) { 549 if (net != &init_net) {
550 WARN(1, KERN_ERR "NFSD: attempt to initialize legacy client " 550 pr_warn("NFSD: attempt to initialize legacy client tracking in a container ignored.\n");
551 "tracking in a container!\n");
552 return -EINVAL; 551 return -EINVAL;
553 } 552 }
554 553
@@ -1260,8 +1259,7 @@ nfsd4_umh_cltrack_init(struct net *net)
1260 1259
1261 /* XXX: The usermode helper s not working in container yet. */ 1260 /* XXX: The usermode helper s not working in container yet. */
1262 if (net != &init_net) { 1261 if (net != &init_net) {
1263 WARN(1, KERN_ERR "NFSD: attempt to initialize umh client " 1262 pr_warn("NFSD: attempt to initialize umh client tracking in a container ignored.\n");
1264 "tracking in a container!\n");
1265 return -EINVAL; 1263 return -EINVAL;
1266 } 1264 }
1267 1265