Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp1745295ybj; Fri, 20 Sep 2019 16:01:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqxTwTTaALyWrNJ/3GwUvEW7X8M9gT/P6ATH0noOlqopkS9pSXzV31FwKvHpPI28w0wFk3yH X-Received: by 2002:aa7:cf86:: with SMTP id z6mr23967571edx.230.1569020498254; Fri, 20 Sep 2019 16:01:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569020498; cv=none; d=google.com; s=arc-20160816; b=jxB+x93uqZ2nJK47l0TYdRdmwgrn4OM0Xmgu+91+zZYSnAs1u+NsAtpqsr+SruN9vQ EovB8N7vnKG+dS7L496kZlikE0WRu1RNdkdM7maI7QSmVKzrJgeqBRqX0skEmDBOiFNA dVvB2MwHniD0ga7RuQxoSWNsq7GGjiLstsqB30XW3K12Ox0V8bOS7tj+7bIgXRGBW9PG 8RNco9b3fjnZLtkkDqLT04QrFD8LmmvtYh5kX0ZCgtnlYbV0FIlrMv5EQ3iuPeUUWp+B t5c4I/samf/wYgHH7Pp6Ld/NudWxt18OLGRy4/H7aGB+5sFhIUn2K4EOCvfLcfASGJHj 3fUw== 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=5MZYZ2ERoFEMnHF2rDxPw6FAkVP4kG2sM40RnozghGM=; b=OOYXad4pFPkorvoHJAa/CiYUoUwCHq0oXgXAKPi383451n4XGppqMEHfYGtlPpJUoj +hq/mWGrU+2cP5qbcLAtroZ/KOnM/XakKoSWnU1E7ifpso7Sj9PdbuzNhKabyp91qzVn JHdkHYQfagv8Wr1ACKEkTAJNz6pb1xtUVYFIk0hNJE2ncUvyD6ZgyzW1GasZvIFT9ntl JjVV6aV8KKLJP6FCLmx6h+R1NrOEs7piTu0s4tI/7KONd9dYfz5MC93KG8kGY7WnKAQJ CmCUg51BuaYd7ra/BcKxJskQ5S7xobBJde2zzU7jywAbZ+FJOFBk2PAGgUcjalU3suBd jQiw== 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 gl26si1806996ejb.17.2019.09.20.16.01.14; Fri, 20 Sep 2019 16:01:38 -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 S2394760AbfITGKo (ORCPT + 99 others); Fri, 20 Sep 2019 02:10:44 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:57872 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2437280AbfITGJE (ORCPT ); Fri, 20 Sep 2019 02:09:04 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id C1A257DC74FEADF82FF1; Fri, 20 Sep 2019 14:09:01 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.439.0; Fri, 20 Sep 2019 14:08:51 +0800 From: Kefeng Wang To: Joe Perches , Andrew Morton , Ingo Molnar , "David S. Miller" , Arnaldo Carvalho de Melo , Andy Whitcroft , Peter Zijlstra , "Alexei Starovoitov" , Daniel Borkmann , "Greg Kroah-Hartman" , Sergey Senozhatsky , Petr Mladek , Arnd Bergmann , CC: , Philipp Reisner , Lars Ellenberg , Jens Axboe , Subject: [PATCH 09/32] drbd: Use pr_warn instead of pr_warning Date: Fri, 20 Sep 2019 14:25:21 +0800 Message-ID: <20190920062544.180997-10-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190920062544.180997-1-wangkefeng.wang@huawei.com> References: <20190920062544.180997-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 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