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 857DBC433F5 for ; Tue, 17 May 2022 07:52:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E74DC6B0072; Tue, 17 May 2022 03:51:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E24226B0073; Tue, 17 May 2022 03:51:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D12A06B0074; Tue, 17 May 2022 03:51:59 -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 BEFCB6B0072 for ; Tue, 17 May 2022 03:51:59 -0400 (EDT) Received: from smtpin31.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 90E1520818 for ; Tue, 17 May 2022 07:51:59 +0000 (UTC) X-FDA: 79474466358.31.3138FD1 Received: from mail-ua1-f43.google.com (mail-ua1-f43.google.com [209.85.222.43]) by imf02.hostedemail.com (Postfix) with ESMTP id D06B3800B8 for ; Tue, 17 May 2022 07:51:49 +0000 (UTC) Received: by mail-ua1-f43.google.com with SMTP id n8so3439372uaj.12 for ; Tue, 17 May 2022 00:51:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=WShrHtR7o1bEMN+GHtHpoPB1ADyCcz+AwfB1sJZyYR4=; b=LOFlwn77BRGGTHQ9iEWKPwBc8EC7NIg2bDsjKTz7PFhls9SUyJa0RoGbGs4i0gbs2h FhVaPs5DErd6RbgHLLK0Psn0eW45ltdzDAmbdKIaYF8kbVhy3CrR3d7qdO6TueERI14t 1nslAb6aebvVqxtyL6KGKnnuTrLo4NW+MwcPU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=WShrHtR7o1bEMN+GHtHpoPB1ADyCcz+AwfB1sJZyYR4=; b=Ub+NhouYvtJvsOrYRZy3+9Kx/PARizVi0Am4nRiIGBrGB6r6pB3YwUy3E+3M5lXqA3 UYOZhrnUd9iF9g25dYePFUcdd+DVUzPic702vnJK0gbPzK/+TyjlQQ17wH2gpEfL8THV YbgVm0y+0GlYf4ThSQhx0hN13ZvQRkfiAMPEX/h0yHsW67IfcstY1siGW2R+RxZ5+Bzf t8i9o4yo3s464UKRewoO2Q+m4tabadIApbO/eCT0OTFlnyPJ6eMtzeWjc1n4mX2N2h7E v2h6h2PGk7ycuYp4iS/HPa9Ey7QJberpoRKKiYlCXCmRb1+eLavxCqoV8zGDWJBCYpj/ /ocw== X-Gm-Message-State: AOAM533Wl97pILrBfBFjZGY8+ouTKDtZBisBO+qeXWsTO4CHIK7pqCO7 MtRQwvmrF90nTKlL6bwubkdf8vzmlUyaVZeKRvoZdA== X-Google-Smtp-Source: ABdhPJwEplLYKvh+UGWkRWwFL7aUrldDFea1pw9lk57FA3WLEL60dkwzpZTESwKPQX9FIONp5mTUpyvS1luMK3t7Bqs= X-Received: by 2002:a9f:3193:0:b0:35d:21ec:4ae1 with SMTP id v19-20020a9f3193000000b0035d21ec4ae1mr7292105uad.100.1652773918317; Tue, 17 May 2022 00:51:58 -0700 (PDT) MIME-Version: 1.0 References: <20220516105100.1412740-1-hsinyi@chromium.org> <20220517033557.3492-1-phillip@squashfs.org.uk> In-Reply-To: <20220517033557.3492-1-phillip@squashfs.org.uk> From: Hsin-Yi Wang Date: Tue, 17 May 2022 15:51:32 +0800 Message-ID: Subject: Re: [PATCH 3/2] squashfs: always build "file direct" version of page actor To: Phillip Lougher Cc: Xiongwei.Song@windriver.com, akpm@linux-foundation.org, houtao1@huawei.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, miaoxie@huawei.com, squashfs-devel@lists.sourceforge.net, willy@infradead.org, yi.zhang@huawei.com, zhengliang6@huawei.com, kernel test robot Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: D06B3800B8 X-Stat-Signature: fobe663c9gsnyd97mcso36ed7qpk3q15 Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=LOFlwn77; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf02.hostedemail.com: domain of hsinyi@chromium.org designates 209.85.222.43 as permitted sender) smtp.mailfrom=hsinyi@chromium.org X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1652773909-818266 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: On Tue, May 17, 2022 at 11:36 AM Phillip Lougher wrote: > > 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 Tested-by: Hsin-Yi Wang Tested with CONFIG_SQUASHFS_FILE_DIRECT unselected. I'll pick this patch to the series. Thanks > --- > 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 >