From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1134C33CAF for ; Thu, 16 Jan 2020 18:47:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B07452053B for ; Thu, 16 Jan 2020 18:47:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579200458; bh=N6NL80NyMEmBK1Ck48h21G8o7JDmrLH68BcMhLlv+3k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=r4aYiYG2il4sFAD5Fzb3AHouYdCbJ5huQY3hn+Em6GNOydPkncy8Foo2iwbgy7gqG bTLGP/9KwkUkpiH1Em+CNd0hV2zz1t88v/OYaOppL7IWubRnuTr8FS32bHh5vIuhaw cV18jhGbdbhy7OCFIBEfV+kQP4ZN3M6SCDLWDCiQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391841AbgAPSrg (ORCPT ); Thu, 16 Jan 2020 13:47:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:49022 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389305AbgAPRKf (ORCPT ); Thu, 16 Jan 2020 12:10:35 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 94F4424686; Thu, 16 Jan 2020 17:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194634; bh=N6NL80NyMEmBK1Ck48h21G8o7JDmrLH68BcMhLlv+3k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OcA/O+C5FUYSxPjqn10/dlByLCN99g2uh1Vk/5Obf5FfqPqSF37rjTO2f9yFoSVX+ tk1iJ4HhwDM3cGqden4F5JBleKHCRfWMytKTmxkzd71wKipGR3eLEQL3eNPLEX3JjM 6DF0hhz4D63KGuZ77nEzqdbfkmvYIzucJZ+oSNJY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gerd Rausch , Santosh Shilimkar , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com Subject: [PATCH AUTOSEL 4.19 493/671] net/rds: Add a few missing rds_stat_names entries Date: Thu, 16 Jan 2020 12:02:11 -0500 Message-Id: <20200116170509.12787-230-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gerd Rausch [ Upstream commit 55c70ca00c982fbc0df4c4d3e31747fb73f4ddb5 ] In a previous commit, fields were added to "struct rds_statistics" but array "rds_stat_names" was not updated accordingly. Please note the inconsistent naming of the string representations that is done in the name of compatibility with the Oracle internal code-base. s_recv_bytes_added_to_socket -> "recv_bytes_added_to_sock" s_recv_bytes_removed_from_socket -> "recv_bytes_freed_fromsock" Fixes: 192a798f5299 ("RDS: add stat for socket recv memory usage") Signed-off-by: Gerd Rausch Acked-by: Santosh Shilimkar Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/rds/stats.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/rds/stats.c b/net/rds/stats.c index 73be187d389e..6bbab4d74c4f 100644 --- a/net/rds/stats.c +++ b/net/rds/stats.c @@ -76,6 +76,8 @@ static const char *const rds_stat_names[] = { "cong_update_received", "cong_send_error", "cong_send_blocked", + "recv_bytes_added_to_sock", + "recv_bytes_freed_fromsock", }; void rds_stats_info_copy(struct rds_info_iterator *iter, -- 2.20.1