Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752410AbeABKD2 (ORCPT + 1 other); Tue, 2 Jan 2018 05:03:28 -0500 Received: from mail-pl0-f66.google.com ([209.85.160.66]:43088 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752147AbeABKDZ (ORCPT ); Tue, 2 Jan 2018 05:03:25 -0500 X-Google-Smtp-Source: ACJfBosaBfuCU8gAmcahmeb994VAtRh/zR2vDK1DXChxmo92xaKYf2oCCwfdOnI7puRLfHB/A/oQtA== From: Joey Pabalinas To: linux-mm@kvack.org Cc: sjenning@redhat.com, ddstreet@ieee.org, linux-kernel@vger.kernel.org, Joey Pabalinas Subject: [PATCH 1/2] mm/zswap: make type and compressor const Date: Tue, 2 Jan 2018 00:03:19 -1000 Message-Id: <20180102100320.24801-2-joeypabalinas@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180102100320.24801-1-joeypabalinas@gmail.com> References: <20180102100320.24801-1-joeypabalinas@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: The characters pointed to by `zswap_compressor`, `type`, and `compressor` aren't ever modified. Add const to the static variable and both parameters in `zswap_pool_find_get()`, `zswap_pool_create()`, and `__zswap_param_set()` Signed-off-by: Joey Pabalinas 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index d39581a076c3aed1e9..a4f2dfaf9131694265 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -90,7 +90,7 @@ module_param_cb(enabled, &zswap_enabled_param_ops, &zswap_enabled, 0644); /* Crypto compressor to use */ #define ZSWAP_COMPRESSOR_DEFAULT "lzo" -static char *zswap_compressor = ZSWAP_COMPRESSOR_DEFAULT; +static const char *zswap_compressor = ZSWAP_COMPRESSOR_DEFAULT; static int zswap_compressor_param_set(const char *, const struct kernel_param *); static struct kernel_param_ops zswap_compressor_param_ops = { @@ -475,7 +475,8 @@ static struct zswap_pool *zswap_pool_last_get(void) } /* type and compressor must be null-terminated */ -static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor) +static struct zswap_pool *zswap_pool_find_get(const char *type, + const char *compressor) { struct zswap_pool *pool; @@ -495,7 +496,8 @@ static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor) return NULL; } -static struct zswap_pool *zswap_pool_create(char *type, char *compressor) +static struct zswap_pool *zswap_pool_create(const char *type, + const char *compressor) { struct zswap_pool *pool; char name[38]; /* 'zswap' + 32 char (max) num + \0 */ @@ -658,7 +660,7 @@ static void zswap_pool_put(struct zswap_pool *pool) /* val must be a null-terminated string */ static int __zswap_param_set(const char *val, const struct kernel_param *kp, - char *type, char *compressor) + const char *type, const char *compressor) { struct zswap_pool *pool, *put_pool = NULL; char *s = strstrip((char *)val); -- 2.15.1