From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754844AbcBPKeV (ORCPT ); Tue, 16 Feb 2016 05:34:21 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:29653 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754741AbcBPKeU (ORCPT ); Tue, 16 Feb 2016 05:34:20 -0500 From: Dmitry Monakhov To: linux-kernel@vger.kernel.org Cc: nbd-general@lists.sourceforge.net, Dmitry Monakhov Subject: [PATCH] nbd: ratelimit error messages from disconnected devices Date: Tue, 16 Feb 2016 14:33:01 +0400 Message-Id: <1455618781-26306-1-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ndb can be explicitly disconnected via NBD_DISCONNECT while active user still exists this result in massive spam to logs. Let's ratelimits such messages. Signed-off-by: Dmitry Monakhov --- drivers/block/nbd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index e4c5cc1..2dbe840 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -175,7 +175,7 @@ static int sock_xmit(struct nbd_device *nbd, int send, void *buf, int size, unsigned long pflags = current->flags; if (unlikely(!sock)) { - dev_err(disk_to_dev(nbd->disk), + dev_err_ratelimited(disk_to_dev(nbd->disk), "Attempted %s on closed socket in sock_xmit\n", (send ? "send" : "recv")); return -EINVAL; @@ -509,7 +509,7 @@ static void nbd_handle_req(struct nbd_device *nbd, struct request *req) mutex_lock(&nbd->tx_lock); if (unlikely(!nbd->sock)) { mutex_unlock(&nbd->tx_lock); - dev_err(disk_to_dev(nbd->disk), + dev_err_ratelimited(disk_to_dev(nbd->disk), "Attempted send on closed socket\n"); goto error_out; } @@ -618,7 +618,7 @@ static void nbd_request_handler(struct request_queue *q) req, req->cmd_type); if (unlikely(!nbd->sock)) { - dev_err(disk_to_dev(nbd->disk), + dev_err_ratelimited(disk_to_dev(nbd->disk), "Attempted send on closed socket\n"); req->errors++; nbd_end_request(nbd, req); -- 1.8.3.1