Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp176242rwe; Wed, 31 Aug 2022 00:14:09 -0700 (PDT) X-Google-Smtp-Source: AA6agR5qMpanTZfKiEDSpPHkC+pzs3LFceM0ArKnzgjwoaILKR8qAgHmhe2+Abs865cYOm8SRD2l X-Received: by 2002:a17:906:ef8b:b0:730:d348:61b9 with SMTP id ze11-20020a170906ef8b00b00730d34861b9mr19316470ejb.350.1661930049684; Wed, 31 Aug 2022 00:14:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661930049; cv=none; d=google.com; s=arc-20160816; b=BAn7vk7AMRplUi8lhgE9m2zvEh0fjpf5dEzVhzPJefs6Ci2+BaZBegji/R3Z3SPNzp eu6egyzXwegBGZaWBNGMnPMbamSj1gyz1NPo7Mrf/HC5GAPgiC31arYv7/wwQ7GVLGZ7 cpaT1GgQ6gBl+vTXU1dyEQ2wpDV8v3l09kvop+X1u8tQchq1n4tDrGRExgg0yYJguPNY ObB2vB1Q2kMgQ/FPtvnneShPLqRPzzx4fkwGphNf2aiv0g8WUIgB22O10GB1QjYqR90M w5zl8wrZxj0/Gu7ahQ5lBpcto3dsKOyUPSZwZI0RUfWnZ1N4wJD/NwD+kQBuPwqChf41 xF7Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0bIaALqCCoKnTcmG8Tx+Yu+PW/wu3l+UJiq3/LZEcxU=; b=nTFRHLJ1l1jvlB61k6AupNTyAOlxQKMJ/ClrJ3EEMiuR/f+peJPep95s9Dzb8omt9G LSbOyEVFIRNNVg/UpnepnkxGVJsxUwpeApFfTSUSFGgNx/JllTkyZ1h79YBSq0ZyeMYh RRxiTOk4ckhf5rt8ThtuUBA+IZx9T8Nwc99FNJTagXrH2q02r5Dt0NCcEt1/n2o7/8O0 fhEbLP94nevTgwJcmWKCawZxC47bglK9fYRBFnvGcVAaJCU8RSA4I8ZvYw+5hM7sAt6M ynkBA7mn/KxxziUuaQ/ZGu5sYg021uOIytz5pjTvWRE+ueUBT6s8mtTdJdv5dH2yqmQA mw7Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dm15-20020a170907948f00b0074299508ae9si3005174ejc.992.2022.08.31.00.13.45; Wed, 31 Aug 2022 00:14:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-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-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229869AbiHaHKH (ORCPT + 99 others); Wed, 31 Aug 2022 03:10:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229682AbiHaHKG (ORCPT ); Wed, 31 Aug 2022 03:10:06 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0FC1F5BA; Wed, 31 Aug 2022 00:10:04 -0700 (PDT) Received: from canpemm500005.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MHZxh0HnnznTvm; Wed, 31 Aug 2022 15:07:36 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500005.china.huawei.com (7.192.104.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 31 Aug 2022 15:10:01 +0800 From: Zhang Yi To: , , , , , , CC: , , , , , , , , , , , , , Subject: [PATCH 01/14] fs/buffer: remove __breadahead_gfp() Date: Wed, 31 Aug 2022 15:20:58 +0800 Message-ID: <20220831072111.3569680-2-yi.zhang@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220831072111.3569680-1-yi.zhang@huawei.com> References: <20220831072111.3569680-1-yi.zhang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500005.china.huawei.com (7.192.104.229) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-ext4@vger.kernel.org No one use __breadahead_gfp() and sb_breadahead_unmovable() any more, remove them. Signed-off-by: Zhang Yi --- fs/buffer.c | 11 ----------- include/linux/buffer_head.h | 8 -------- 2 files changed, 19 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 55e762a58eb6..a0b70b3239f3 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -1348,17 +1348,6 @@ void __breadahead(struct block_device *bdev, sector_t block, unsigned size) } EXPORT_SYMBOL(__breadahead); -void __breadahead_gfp(struct block_device *bdev, sector_t block, unsigned size, - gfp_t gfp) -{ - struct buffer_head *bh = __getblk_gfp(bdev, block, size, gfp); - if (likely(bh)) { - ll_rw_block(REQ_OP_READ | REQ_RAHEAD, 1, &bh); - brelse(bh); - } -} -EXPORT_SYMBOL(__breadahead_gfp); - /** * __bread_gfp() - reads a specified block and returns the bh * @bdev: the block_device to read from diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 089c9ade4325..c3863c417b00 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -214,8 +214,6 @@ struct buffer_head *__getblk_gfp(struct block_device *bdev, sector_t block, void __brelse(struct buffer_head *); void __bforget(struct buffer_head *); void __breadahead(struct block_device *, sector_t block, unsigned int size); -void __breadahead_gfp(struct block_device *, sector_t block, unsigned int size, - gfp_t gfp); struct buffer_head *__bread_gfp(struct block_device *, sector_t block, unsigned size, gfp_t gfp); void invalidate_bh_lrus(void); @@ -340,12 +338,6 @@ sb_breadahead(struct super_block *sb, sector_t block) __breadahead(sb->s_bdev, block, sb->s_blocksize); } -static inline void -sb_breadahead_unmovable(struct super_block *sb, sector_t block) -{ - __breadahead_gfp(sb->s_bdev, block, sb->s_blocksize, 0); -} - static inline struct buffer_head * sb_getblk(struct super_block *sb, sector_t block) { -- 2.31.1