From patchwork Tue May 17 08:26:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 12852109 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 5D5F0C433EF for ; Tue, 17 May 2022 08:27:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DD4EE6B0073; Tue, 17 May 2022 04:27:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D84606B0074; Tue, 17 May 2022 04:27:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C73FD6B0075; Tue, 17 May 2022 04:27:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id BA65C6B0073 for ; Tue, 17 May 2022 04:27:45 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9BB452049B for ; Tue, 17 May 2022 08:27:45 +0000 (UTC) X-FDA: 79474556490.03.5DC3C70 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf16.hostedemail.com (Postfix) with ESMTP id 1F85F180005 for ; Tue, 17 May 2022 08:27:33 +0000 (UTC) Received: by mail-pf1-f174.google.com with SMTP id p12so16317181pfn.0 for ; Tue, 17 May 2022 01:27:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5RbQ3j9RMbZ/D6MAR7ISAUvOQDvpOlhf1s/Zk6REvQs=; b=cERWjiKZfw6WI/Su4knl08OFpy0v1f15tlBLnsXgpC5PzSp8bOebBCMkUcd5OCB9UD lIxv/+8BEnS2GfuwK7MqUOVhkyw9+22ami2fNlkkuviZhGeIVFudl94jcGgPWlxFoBv4 HyTm/0jPE9VJ4tQ9d/oDOTxiG0k05DenlMHTA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5RbQ3j9RMbZ/D6MAR7ISAUvOQDvpOlhf1s/Zk6REvQs=; b=m1RqiM4EQFaF4x1ynxB+e0p1Ef/QdIUK5MsL/WeiBDFwGfPCjafexqPdj/6uzgoa2l Edk3lzzHEY8DNclbChEYH2Z3jtUJ1avD1vDEvVfIu5c0JsI427im8ieT0Ml/d61FFIsm O+XILOHre/D3AX7syxTZBEE/asoy+OiW0T47b7JAdvUSEmXszXUzqNqhY3A0QoFQZP4P R2x+JaBHkJ5S+vMHvZABYiQO1mSMBvFbJEO+Ot1739I/+kKDAfshl2w7QHxF6PBIq0HG q3fUHILryjlYwPyHKAAQUhRbO46ZEykJL6KOYisEHxhtg0nRn+JSw17GBu7fveX4/qUH wClA== X-Gm-Message-State: AOAM533r1GLRISv4tK5Polqa7Vb/hsoFU8OzbiFRREhl4ZbJOptHNFvr NkGeB8NqmNZ476jWsRYY6oRLktVPV/RMrw== X-Google-Smtp-Source: ABdhPJz4aF4dMhqEmu0GTfbz8WlmgQ+lpbplL1Gv3txGEhH2G1P5A91yfhnjV8d4iZYVkJ5sRaF/lw== X-Received: by 2002:a05:6a00:164c:b0:50a:472a:6b0a with SMTP id m12-20020a056a00164c00b0050a472a6b0amr21308254pfc.77.1652776064207; Tue, 17 May 2022 01:27:44 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:beb2:ec58:2159:9a33]) by smtp.gmail.com with ESMTPSA id k9-20020a628409000000b0050dc76281d3sm8615083pfd.173.2022.05.17.01.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 01:27:43 -0700 (PDT) From: Hsin-Yi Wang To: Phillip Lougher , Matthew Wilcox , Xiongwei Song Cc: Zheng Liang , Zhang Yi , Hou Tao , Miao Xie , Andrew Morton , "linux-mm @ kvack . org" , "squashfs-devel @ lists . sourceforge . net" , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] Revert "squashfs: provide backing_dev_info in order to disable read-ahead" Date: Tue, 17 May 2022 16:26:50 +0800 Message-Id: <20220517082650.2005840-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.36.0.550.gb090851708-goog In-Reply-To: <20220517082650.2005840-1-hsinyi@chromium.org> References: <20220517082650.2005840-1-hsinyi@chromium.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1F85F180005 X-Stat-Signature: yensomx1zwfidrix4iug5z9pnx43asrs X-Rspam-User: Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=cERWjiKZ; spf=pass (imf16.hostedemail.com: domain of hsinyi@chromium.org designates 209.85.210.174 as permitted sender) smtp.mailfrom=hsinyi@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Rspamd-Server: rspam09 X-HE-Tag: 1652776053-103729 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: This reverts commit 9eec1d897139e5de287af5d559a02b811b844d82. Revert closing the readahead to squashfs since the readahead callback for squashfs is implemented. Suggested-by: Xiongwei Song Signed-off-by: Hsin-Yi Wang --- fs/squashfs/super.c | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c index 6d594ba2ed28..32565dafa7f3 100644 --- a/fs/squashfs/super.c +++ b/fs/squashfs/super.c @@ -29,7 +29,6 @@ #include #include #include -#include #include "squashfs_fs.h" #include "squashfs_fs_sb.h" @@ -113,24 +112,6 @@ static const struct squashfs_decompressor *supported_squashfs_filesystem( return decompressor; } -static int squashfs_bdi_init(struct super_block *sb) -{ - int err; - unsigned int major = MAJOR(sb->s_dev); - unsigned int minor = MINOR(sb->s_dev); - - bdi_put(sb->s_bdi); - sb->s_bdi = &noop_backing_dev_info; - - err = super_setup_bdi_name(sb, "squashfs_%u_%u", major, minor); - if (err) - return err; - - sb->s_bdi->ra_pages = 0; - sb->s_bdi->io_pages = 0; - - return 0; -} static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc) { @@ -146,20 +127,6 @@ static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc) TRACE("Entered squashfs_fill_superblock\n"); - /* - * squashfs provides 'backing_dev_info' in order to disable read-ahead. For - * squashfs, I/O is not deferred, it is done immediately in read_folio, - * which means the user would always have to wait their own I/O. So the effect - * of readahead is very weak for squashfs. squashfs_bdi_init will set - * sb->s_bdi->ra_pages and sb->s_bdi->io_pages to 0 and close readahead for - * squashfs. - */ - err = squashfs_bdi_init(sb); - if (err) { - errorf(fc, "squashfs init bdi failed"); - return err; - } - sb->s_fs_info = kzalloc(sizeof(*msblk), GFP_KERNEL); if (sb->s_fs_info == NULL) { ERROR("Failed to allocate squashfs_sb_info\n");