From patchwork Sat Feb 25 12:15:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 61515 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1476389wrd; Sat, 25 Feb 2023 05:10:47 -0800 (PST) X-Google-Smtp-Source: AK7set9epIvyHgbQbg/ot9NYCQyWa8UMULgckstI7MW7pGngrF3FBKMCssuNhoAm0tZnBbJXpAo6 X-Received: by 2002:a17:906:518:b0:8b1:3554:25 with SMTP id j24-20020a170906051800b008b135540025mr24991636eja.61.1677330647673; Sat, 25 Feb 2023 05:10:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677330647; cv=none; d=google.com; s=arc-20160816; b=UwddNfLmVJ7yuZzGgSxGXi1qSpbFuN5upgF0lwY/3BIiPQP6gFB4cSNB+6jWdyIhdG 89lqtPLMqAOsp5jPb4sKQmy9V2SNQcwVGmC+DT6gTKtCXWp60MUOzdaAgYTl3kwKnzxN QA3nFw2BvlgfDQttJvgMepHM7srP1OPmfxiUhazYkTWpwNajQ/7QQM7+5DGWRNnzwFyW ruH6v2oh++tHuFfY8bwsTxT9u0W9mxoxhTQE8wRLEVZ2ypAbUgwmAh7hvpzwb+hr7cWF GG6Ry1K29xyXsIt9JyEgK2tQZBIissHheHjYe+wdR5jNczSGrzX885CdxbXD6q6VyVjM oaxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Z6pAQ7uz0WLLlrPd9mi/t+CySPJOE4PknLsZF6Ay5mc=; b=plML8AZxEZ9yEkYcr9aOIHQ+Ygc/zxjdwITEwAMeO3Iz8H2OeEh2pk/k+sHUrpdU+a z7Dz2Uxm3dgwOB+gneMGJewMqbpbVmNokrCucAuSAP4qvDAjLlei3+nXY96cdNqP2Hu5 S4oOEV5UwLsh9fvuwQxoIsl340FVWr3F+4dCUZKVZXRRsjRQAbGpXg0d9BojNVLg2gkS D0Ik6S0vM1GGZjWdmSAIBIGIHd4fYzVhr1x/LHZ0M4V/gxekoMXQt4dl9bezkA97XX2j 7x5Ux5aG+fiW5XIv8J3yCCuWQHTCg2YTvIMsipX/t1crcZP1lE2unHRG21+p4aYRZ5vy afHA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i20-20020a1709063c5400b008dd8491f9f8si2021144ejg.118.2023.02.25.05.10.14; Sat, 25 Feb 2023 05:10:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229535AbjBYMPc (ORCPT + 99 others); Sat, 25 Feb 2023 07:15:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229379AbjBYMPb (ORCPT ); Sat, 25 Feb 2023 07:15:31 -0500 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DBCE16322 for ; Sat, 25 Feb 2023 04:15:28 -0800 (PST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed50:4d58:64da:92bc:9ef0]) by andre.telenet-ops.be with bizsmtp id RQFP2900D0sc8Fi01QFPkr; Sat, 25 Feb 2023 13:15:24 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1pVtS4-00A3bM-9F; Sat, 25 Feb 2023 13:15:23 +0100 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1pVtSV-00DnVN-Ac; Sat, 25 Feb 2023 13:15:23 +0100 From: Geert Uytterhoeven To: Minchan Kim , Sergey Senozhatsky , Jens Axboe , Andrew Morton Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] zram: Use atomic_long_read() to read atomic_long_t Date: Sat, 25 Feb 2023 13:15:23 +0100 Message-Id: <20230225121523.3288544-1-geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758808661585635010?= X-GMAIL-MSGID: =?utf-8?q?1758808661585635010?= On 32-bit: drivers/block/zram/zram_drv.c: In function ‘mm_stat_show’: drivers/block/zram/zram_drv.c:1234:23: error: passing argument 1 of ‘atomic64_read’ from incompatible pointer type [-Werror=incompatible-pointer-types] 1234 | (u64)atomic64_read(&pool_stats.objs_moved)); | ^~~~~~~~~~~~~~~~~~~~~~ | | | atomic_long_t * {aka struct *} In file included from ./include/linux/atomic.h:82, from ./include/linux/mm_types_task.h:13, from ./include/linux/mm_types.h:5, from ./include/linux/buildid.h:5, from ./include/linux/module.h:14, from drivers/block/zram/zram_drv.c:18: ./include/linux/atomic/atomic-instrumented.h:644:33: note: expected ‘const atomic64_t *’ {aka ‘const struct *’} but argument is of type ‘atomic_long_t *’ {aka ‘struct *’} 644 | atomic64_read(const atomic64_t *v) | ~~~~~~~~~~~~~~~~~~^ Fix this by using atomic_long_read() instead. Reported-by; noreply@ellerman.id.au Fixes: b7d89654a988a2a4 ("zram: show zsmalloc objs_moved stat in mm_stat") Signed-off-by: Geert Uytterhoeven Reported-by: kernel test robot --- drivers/block/zram/zram_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 3194e9254c6f3a04..8fff358c9cbace17 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1221,7 +1221,7 @@ static ssize_t mm_stat_show(struct device *dev, max_used = atomic_long_read(&zram->stats.max_used_pages); ret = scnprintf(buf, PAGE_SIZE, - "%8llu %8llu %8llu %8lu %8ld %8llu %8lu %8llu %8llu %8llu\n", + "%8llu %8llu %8llu %8lu %8ld %8llu %8lu %8llu %8llu %8lu\n", orig_size << PAGE_SHIFT, (u64)atomic64_read(&zram->stats.compr_data_size), mem_used << PAGE_SHIFT, @@ -1231,7 +1231,7 @@ static ssize_t mm_stat_show(struct device *dev, atomic_long_read(&pool_stats.pages_compacted), (u64)atomic64_read(&zram->stats.huge_pages), (u64)atomic64_read(&zram->stats.huge_pages_since), - (u64)atomic64_read(&pool_stats.objs_moved)); + atomic_long_read(&pool_stats.objs_moved)); up_read(&zram->init_lock); return ret;