Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp1302216ybg; Fri, 18 Oct 2019 15:30:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqyjsEWn2JKW+d2fDfDrZDEHkshA7ZpKqnWYLtTqOjRG7yoGH8RBSFTUjnz3v0wW/5QmUWmK X-Received: by 2002:a05:6402:2042:: with SMTP id bc2mr12435539edb.12.1571437844008; Fri, 18 Oct 2019 15:30:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571437844; cv=none; d=google.com; s=arc-20160816; b=xBvonacc/I5yYwOBGoTuSihLt4I6oywDq37Ryti3aDCCh5jTVvvAWnRkOMO1N0wK2j G198YEVp6sHnJTbtUCUwjRtHqnVly9L4yxx5ZAN1WF6E8qVFVp5tdej0PIHsaSYzr0wX e89CGEzb3A+mTY+SfZKy7TygOS8OUQ9+n1dhKZutARpv7i+fcDhyLKqwcJvpRx3S3VbS poZy27xmlKehjVgf5LIRiQ0ibM/dreYpP2C4vLl+N/rBNHhpn032nkf1+mX3sSu2D0Xx zDgsl7E+7RnJAHZ9LPU/2EFzp0iGbTMHwIIa7lnwjEzQ1tvieDY88A9yJ1sKFg/TTx/Z mUGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=zCfCy5cFgEyW2KEcoxmf7EYh55N4qa/udLWpqGXDDaE=; b=bXOnfKJQQkTaEhTds2QDPMQbWmCIjIXKMCwpmTuGQAn0hQLVxipqkAHuZmJVTRoq4+ m0CkvPiPZcB71podPNsFfEUhGoMQ9HC+LPb3KA8TrIP1f8vsF8mnb/BkELDs2wFB2JiO AVKCEbAdEfv5KLAZuUbyISvWLoUXir3ok0mmhSsNPK+frbDXv6rwQv/M7HOWp+Tba2YM 6IuoPiYYxu2t9CeLPpgDDVjxwcVNI/jBlj7A86WxxtBa+yO63LUWNigAY0FKe70Yyow3 8XsAl8uI6QVcSloKitVM3wOIz5Mmoa55aJTH+Vpjo3P4ObspinXocTKlxHeu7fdb3Mf4 7ekQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h91si5271792edd.270.2019.10.18.15.30.21; Fri, 18 Oct 2019 15:30:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2504303AbfJRFGr (ORCPT + 99 others); Fri, 18 Oct 2019 01:06:47 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4679 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2504043AbfJRFGq (ORCPT ); Fri, 18 Oct 2019 01:06:46 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id F20BB516FE4D8C20BE4A; Fri, 18 Oct 2019 11:19:30 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.439.0; Fri, 18 Oct 2019 11:19:24 +0800 From: Kefeng Wang To: Petr Mladek , CC: Kefeng Wang , Philipp Reisner , Lars Ellenberg , Jens Axboe , , Sergey Senozhatsky Subject: [PATCH v2 09/33] drbd: Use pr_warn instead of pr_warning Date: Fri, 18 Oct 2019 11:18:26 +0800 Message-ID: <20191018031850.48498-9-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191018031850.48498-1-wangkefeng.wang@huawei.com> References: <20191018031710.41052-1-wangkefeng.wang@huawei.com> <20191018031850.48498-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As said in commit f2c2cbcc35d4 ("powerpc: Use pr_warn instead of pr_warning"), removing pr_warning so all logging messages use a consistent _warn style. Let's do it. Cc: Philipp Reisner Cc: Lars Ellenberg Cc: Jens Axboe Cc: drbd-dev@lists.linbit.com Reviewed-by: Sergey Senozhatsky Signed-off-by: Kefeng Wang --- drivers/block/drbd/drbd_nl.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 5d52a2d32155..de2f94d0103a 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -268,19 +268,18 @@ static int drbd_adm_prepare(struct drbd_config_context *adm_ctx, /* some more paranoia, if the request was over-determined */ if (adm_ctx->device && adm_ctx->resource && adm_ctx->device->resource != adm_ctx->resource) { - pr_warning("request: minor=%u, resource=%s; but that minor belongs to resource %s\n", - adm_ctx->minor, adm_ctx->resource->name, - adm_ctx->device->resource->name); + pr_warn("request: minor=%u, resource=%s; but that minor belongs to resource %s\n", + adm_ctx->minor, adm_ctx->resource->name, + adm_ctx->device->resource->name); drbd_msg_put_info(adm_ctx->reply_skb, "minor exists in different resource"); return ERR_INVALID_REQUEST; } if (adm_ctx->device && adm_ctx->volume != VOLUME_UNSPECIFIED && adm_ctx->volume != adm_ctx->device->vnr) { - pr_warning("request: minor=%u, volume=%u; but that minor is volume %u in %s\n", - adm_ctx->minor, adm_ctx->volume, - adm_ctx->device->vnr, - adm_ctx->device->resource->name); + pr_warn("request: minor=%u, volume=%u; but that minor is volume %u in %s\n", + adm_ctx->minor, adm_ctx->volume, + adm_ctx->device->vnr, adm_ctx->device->resource->name); drbd_msg_put_info(adm_ctx->reply_skb, "minor exists as different volume"); return ERR_INVALID_REQUEST; } -- 2.20.1