From patchwork Fri Jun 17 08:38:09 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: 12885293 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 B391BC433EF for ; Fri, 17 Jun 2022 08:38:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 53D5A6B0081; Fri, 17 Jun 2022 04:38:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C67F6B0082; Fri, 17 Jun 2022 04:38:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 33FE26B0083; Fri, 17 Jun 2022 04:38:43 -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 21B976B0081 for ; Fri, 17 Jun 2022 04:38:43 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id EA3D181534 for ; Fri, 17 Jun 2022 08:38:42 +0000 (UTC) X-FDA: 79587076884.02.4CAFCDD Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by imf10.hostedemail.com (Postfix) with ESMTP id 86B63C000A for ; Fri, 17 Jun 2022 08:38:42 +0000 (UTC) Received: by mail-pj1-f43.google.com with SMTP id f16so2432049pjj.1 for ; Fri, 17 Jun 2022 01:38:42 -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=ZkbtHcgR5KA0zD+x9oTUHYVWwacT9VRypGcZ4wLZpOg=; b=IQFp5xvBUij3vF6RFgONUsdI4F7LxAqN3ZtrQJPeUNxo+8zjmXF0j0NLkeatzKk0Mu Defn/MOopf+Tt0LZJhZgRZHPpDV16Far+cgOJxrI7ZBIjwr2nsEfcGhxQyeciQWOJJk9 92AbvVtuk7PzI/PoFh5iu1MlFb2Rm7mCnC7lc= 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=ZkbtHcgR5KA0zD+x9oTUHYVWwacT9VRypGcZ4wLZpOg=; b=8OlC6/sNKWKdvYHQOHhCqurNQyszFJ2lpXnsV0QosSFHkHVCAhIhmYwUsyafoqcXX5 TxwDKYn2FokQymrtqqyOvH00JnGWYymWMc6qXaSyBMA83TsCTOpyYnV3iSCyA17dfgU1 LYxV53eColLIlokIjMUsUN5y6RaYqQKmSnGrHnNh5EgCE+KYpi0Fk4fyDUBBM/A3lo4T OS7rtMB0EBeZx63GA8ayYLA0pv/SiFhALh2DSNrgJZoaDXJZNosX+QKE/4a2bWcMuiZv asMfx3Dn3MzhyGGtixoX51Kaxiq2c4ToF50Ve59AXC3o/Itoa0hHf/qRyvWpYnhfdSSE q4IA== X-Gm-Message-State: AJIora8X+7F8xKyFYXU8xbThYNzxfEt8Uj+QaYDRVFsymw/LgvP+JWki fGodYS/C4OkCPEemghjhVOb5tA== X-Google-Smtp-Source: AGRyM1s7VdOCGqUQpIDER4YWqjxPf/Ek4KvwYv/N24Zykvnrz2Rw2pxH86XQrvXmIMf1TkI7KpHZxg== X-Received: by 2002:a17:902:930c:b0:167:8960:2c39 with SMTP id bc12-20020a170902930c00b0016789602c39mr8426893plb.33.1655455121565; Fri, 17 Jun 2022 01:38:41 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:a0dc:9427:fea8:f78a]) by smtp.gmail.com with ESMTPSA id d12-20020a62f80c000000b005185407eda5sm3154103pfh.44.2022.06.17.01.38.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 01:38:41 -0700 (PDT) From: Hsin-Yi Wang To: Phillip Lougher , Matthew Wilcox , Marek Szyprowski , Andrew Morton Cc: Xiongwei Song , Zheng Liang , Zhang Yi , Hou Tao , Miao Xie , "linux-mm @ kvack . org" , "squashfs-devel @ lists . sourceforge . net" , linux-kernel@vger.kernel.org Subject: [PATCH v7 1/4] Revert "squashfs: provide backing_dev_info in order to disable read-ahead" Date: Fri, 17 Jun 2022 16:38:09 +0800 Message-Id: <20220617083810.337573-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog In-Reply-To: <20220617083810.337573-1-hsinyi@chromium.org> References: <20220617083810.337573-1-hsinyi@chromium.org> MIME-Version: 1.0 ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=IQFp5xvB; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf10.hostedemail.com: domain of hsinyi@chromium.org designates 209.85.216.43 as permitted sender) smtp.mailfrom=hsinyi@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655455122; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZkbtHcgR5KA0zD+x9oTUHYVWwacT9VRypGcZ4wLZpOg=; b=Lt/4CMJqAtB3YZJzXvctFG3CZciprkdH9A373UN6oFHFJ9itQ5jseX1FCVc0PE3hIADkwe 4CNNolGDjMg5qATTxay9WPHCW6fXx1MePfAYACjCgKWJe0KmgyWD0xOKv+GQK9H2MQgiLi c/aWNJDujoXniokDIgiNa+0hglvf6LA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655455122; a=rsa-sha256; cv=none; b=xIPJd4toibZmAIRKlXYKomeYRuKCb3pxu7NZYdIU9qi2TJ/88r+K8V4vDC2M8hFROeLekJ QFKU/m1Zo6CUEoo5B+8LHbO7R4z5TOnCdVoVmGwRcilUbk/UmX6gvx0uxyNeCZAPAyje3O h+XPNKnXBQsT+g9uvCT7Boxxuu8zr+Y= X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 86B63C000A X-Rspam-User: Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=IQFp5xvB; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf10.hostedemail.com: domain of hsinyi@chromium.org designates 209.85.216.43 as permitted sender) smtp.mailfrom=hsinyi@chromium.org X-Stat-Signature: idasoggfu8ch1ptaf4sns815furegurm X-HE-Tag: 1655455122-91198 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 6d594ba2ed28f..32565dafa7f3b 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");