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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C347CC433F5 for ; Tue, 17 May 2022 03:36:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4935C8D0009; Mon, 16 May 2022 23:36:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 442A28D0003; Mon, 16 May 2022 23:36:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 309BF8D0009; Mon, 16 May 2022 23:36:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 217B28D0003 for ; Mon, 16 May 2022 23:36:45 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id EE5F781194 for ; Tue, 17 May 2022 03:36:44 +0000 (UTC) X-FDA: 79473823128.01.D21B285 Received: from p3plwbeout26-02.prod.phx3.secureserver.net (p3plsmtp26-02-2.prod.phx3.secureserver.net [216.69.139.26]) by imf31.hostedemail.com (Postfix) with ESMTP id F22D3200AF for ; Tue, 17 May 2022 03:36:16 +0000 (UTC) Received: from mailex.mailcore.me ([94.136.40.143]) by :WBEOUT: with ESMTP id qo0onQyYWFHlsqo0pnAZKc; Mon, 16 May 2022 20:36:43 -0700 X-CMAE-Analysis: v=2.4 cv=QsubYX+d c=1 sm=1 tr=0 ts=6283184b a=EhJYbXVJKsomWlz4CTV+qA==:117 a=84ok6UeoqCVsigPHarzEiQ==:17 a=ggZhUymU-5wA:10 a=oZkIemNP1mAA:10 a=QyXUC8HyAAAA:8 a=FXvPX3liAAAA:8 a=XPsDEoqG7ybQwvttNyoA:9 a=UObqyxdv-6Yh2QiB9mM_:22 X-SECURESERVER-ACCT: phillip@squashfs.org.uk X-SID: qo0onQyYWFHls Received: from 82-69-79-175.dsl.in-addr.zen.co.uk ([82.69.79.175] helo=localhost.localdomain) by smtp12.mailcore.me with esmtpa (Exim 4.94.2) (envelope-from ) id 1nqo0n-0004Sd-I9; Tue, 17 May 2022 04:36:41 +0100 From: Phillip Lougher To: hsinyi@chromium.org Cc: Xiongwei.Song@windriver.com, akpm@linux-foundation.org, houtao1@huawei.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, miaoxie@huawei.com, phillip@squashfs.org.uk, squashfs-devel@lists.sourceforge.net, willy@infradead.org, yi.zhang@huawei.com, zhengliang6@huawei.com, kernel test robot Subject: [PATCH 3/2] squashfs: always build "file direct" version of page actor Date: Tue, 17 May 2022 04:35:57 +0100 Message-Id: <20220517033557.3492-1-phillip@squashfs.org.uk> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220516105100.1412740-1-hsinyi@chromium.org> References: <20220516105100.1412740-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailcore-Auth: 439999529 X-Mailcore-Domain: 1394945 X-123-reg-Authenticated: phillip@squashfs.org.uk X-Originating-IP: 82.69.79.175 X-CMAE-Envelope: MS4xfKzKVEFgMKnnQg0mqZB5AYhYglcvZgStVGQh5O3HEefgRjn9jy6J7OSQ0iWjKCDOahfzR4qJxegvdKKQsMP26nWV4OWT15sFHTEKbNsQbD2zm38SAHZU yCIkwOjdhR2jbHsVDgCpO2bPetxSf7e+iWnJ/34dXe5M/HXQoLWba0qaxL/IMZSuai5AtcHQjD2bfoxSqUyvgsWF6q35tsPrNLE= X-Rspamd-Queue-Id: F22D3200AF X-Stat-Signature: iepqjm6xscfqdx8dsqr67jtbtibtgnq1 Authentication-Results: imf31.hostedemail.com; dkim=none; dmarc=none; spf=none (imf31.hostedemail.com: domain of phillip@squashfs.org.uk has no SPF policy when checking 216.69.139.26) smtp.mailfrom=phillip@squashfs.org.uk X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1652758576-48160 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Squashfs_readahead uses the "file direct" version of the page actor, and so build it unconditionally. Reported-by: kernel test robot Signed-off-by: Phillip Lougher --- fs/squashfs/Makefile | 4 ++-- fs/squashfs/page_actor.h | 41 ---------------------------------------- 2 files changed, 2 insertions(+), 43 deletions(-) diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile index 7bd9b8b856d0..477c89a519ee 100644 --- a/fs/squashfs/Makefile +++ b/fs/squashfs/Makefile @@ -5,9 +5,9 @@ obj-$(CONFIG_SQUASHFS) += squashfs.o squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o -squashfs-y += namei.o super.o symlink.o decompressor.o +squashfs-y += namei.o super.o symlink.o decompressor.o page_actor.o squashfs-$(CONFIG_SQUASHFS_FILE_CACHE) += file_cache.o -squashfs-$(CONFIG_SQUASHFS_FILE_DIRECT) += file_direct.o page_actor.o +squashfs-$(CONFIG_SQUASHFS_FILE_DIRECT) += file_direct.o squashfs-$(CONFIG_SQUASHFS_DECOMP_SINGLE) += decompressor_single.o squashfs-$(CONFIG_SQUASHFS_DECOMP_MULTI) += decompressor_multi.o squashfs-$(CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU) += decompressor_multi_percpu.o diff --git a/fs/squashfs/page_actor.h b/fs/squashfs/page_actor.h index 2e3073ace009..26e07373af8a 100644 --- a/fs/squashfs/page_actor.h +++ b/fs/squashfs/page_actor.h @@ -6,46 +6,6 @@ * Phillip Lougher */ -#ifndef CONFIG_SQUASHFS_FILE_DIRECT -struct squashfs_page_actor { - void **page; - int pages; - int length; - int next_page; -}; - -static inline struct squashfs_page_actor *squashfs_page_actor_init(void **page, - int pages, int length) -{ - struct squashfs_page_actor *actor = kmalloc(sizeof(*actor), GFP_KERNEL); - - if (actor == NULL) - return NULL; - - actor->length = length ? : pages * PAGE_SIZE; - actor->page = page; - actor->pages = pages; - actor->next_page = 0; - return actor; -} - -static inline void *squashfs_first_page(struct squashfs_page_actor *actor) -{ - actor->next_page = 1; - return actor->page[0]; -} - -static inline void *squashfs_next_page(struct squashfs_page_actor *actor) -{ - return actor->next_page == actor->pages ? NULL : - actor->page[actor->next_page++]; -} - -static inline void squashfs_finish_page(struct squashfs_page_actor *actor) -{ - /* empty */ -} -#else struct squashfs_page_actor { union { void **buffer; @@ -76,4 +36,3 @@ static inline void squashfs_finish_page(struct squashfs_page_actor *actor) actor->squashfs_finish_page(actor); } #endif -#endif -- 2.34.1