From patchwork Fri Jan 24 09:31:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 233146 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 46395C32771 for ; Fri, 24 Jan 2020 10:02:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E274206D5 for ; Fri, 24 Jan 2020 10:02:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860169; bh=n7Dxbm6t548y2aRIJm/87HDLAthkUP1D6Haxu98aAJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=T4pnG9LeSdEaIbH/9YgP1I1QKqYqtasnwOenW/eBXLu7c5S0zOdfcen5hHMoBYsxo cthHm/IMKvfE09Uv4ydbGrItdHypZp4A+s1pKdCKKaibeCYjM+8Ue7g4SG1XnnVZ73 IMROVcNg/J7OqVPp/taVbzdjI+fUAoPmZO+LDtNE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388947AbgAXKCp (ORCPT ); Fri, 24 Jan 2020 05:02:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:38310 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388944AbgAXKCp (ORCPT ); Fri, 24 Jan 2020 05:02:45 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EB429206D5; Fri, 24 Jan 2020 10:02:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860164; bh=n7Dxbm6t548y2aRIJm/87HDLAthkUP1D6Haxu98aAJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UYwqs0QzDQ+x6aTNu9jcczFnZ8MVKcwWdstTgTMCVp425HLeXPeTOPtY+VwkXWgN9 Px0jOt6FFDtvO+tgeognGEJEpP/GUA9PM7gMcWZTnyoRKAXfBhMWQCouUkErRag4Bg LhlLPZI2xJqxLqVl54svpgYyxItG0oqDC+2pkzok= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gerd Rausch , Santosh Shilimkar , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 273/343] net/rds: Add a few missing rds_stat_names entries Date: Fri, 24 Jan 2020 10:31:31 +0100 Message-Id: <20200124092955.815143020@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 73be187d389ed..6bbab4d74c4fe 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,