Merge branch 'for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal...

[firefly-linux-kernel-4.4.55.git] / net / sunrpc / svc_xprt.c

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 4bda09d7e1a4cc6e5c5eaf24eec5b171ae922613..b98ee35149121602b42ace9365bfd5f21e84767a 100644 (file)
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -544,14 +544,11 @@ static void svc_check_conn_limits(struct svc_serv *serv)
                struct svc_xprt *xprt = NULL;
                spin_lock_bh(&serv->sv_lock);
                if (!list_empty(&serv->sv_tempsocks)) {
-                       if (net_ratelimit()) {
-                               /* Try to help the admin */
-                               printk(KERN_NOTICE "%s: too many open  "
-                                      "connections, consider increasing %s\n",
-                                      serv->sv_name, serv->sv_maxconn ?
-                                      "the max number of connections." :
-                                      "the number of threads.");
-                       }
+                       /* Try to help the admin */
+                       net_notice_ratelimited("%s: too many open connections, consider increasing the %s\n",
+                                              serv->sv_name, serv->sv_maxconn ?
+                                              "max number of connections" :
+                                              "number of threads");
                        /*
                         * Always select the oldest connection. It's not fair,
                         * but so is life