Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp696007rwe; Thu, 1 Sep 2022 06:25:00 -0700 (PDT) X-Google-Smtp-Source: AA6agR6Tmsl9NMIu9m/u/0k+d1JHaJjU1N5REUWJUc7wyKjaIUJTrG43YGknunXE8wZWWJdUT4Sx X-Received: by 2002:a65:6541:0:b0:42b:1b04:327b with SMTP id a1-20020a656541000000b0042b1b04327bmr25971818pgw.145.1662038700443; Thu, 01 Sep 2022 06:25:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662038700; cv=none; d=google.com; s=arc-20160816; b=uyya7oVA6ykjct+/izLKPCAXYVvmLfb8UDIl2/4fJ7Y77rLXBkSztYynAKZZlZjG8J Mi/6IJAkFGR3w+09boAPXWyos/N7BHg+6p7/tOkVKXwheeB0b1bhc0SiHRKLxrMKjxrm SG8Zc6VxaML5Bzcbh9KFiDxS8Wy/s1178wk1m+5qVt07ltaEcr1gl5k0Q9i1/jv/2OKc 2v5onIHbE6j5wGCtiRS6NB2dtOMlfoQa15IGZG1Y8SRsHHJVtXmmLawcIX7JgUHGtAns QAFAGozaXBiIQG3dCHUL6ywfQVLol20Z2FgvJlhkd5G/BOBbZs+lSZv2wKIgtPVnFIWN KzQQ== 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=uC15Ler6Q0ldDQAe3ikHGVkdmFKYI754oQr0CP5MVSw=; b=EyHicW05wgQXHNER2PSuh3Lf3QV4RzT5Sd0EoMF68ZD0lO60kBri/LAFfjqiQSuHHp h5t/VzF321mSDDvEDKH0fTkHdpbyf0I0T+YvycwALjEvOnu1GScoPF9gpeF01n143xtL OhZ+O7R0anKVka4lKU83MUF1/49Ypwww/f1qJ549ub9kY0aYyffB2+Hn11vY3FY4ZF9Z Ln9pMWs8xuKSmPLGk104CymgUZH+NxblI5luZIfxITK+4JU9QZkc+2B2mqrX2UcZ0DeH A12a0eJRIyWLqdIgYFm22YvCTzUwdqe225bJKP1G4495M4/25WkyD4hh/mKHmK1Rhhrp 26nw== 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 h12-20020a056a00218c00b0052d939cdf27si8631118pfi.232.2022.09.01.06.24.45; Thu, 01 Sep 2022 06:25:00 -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 S234394AbiIANYe (ORCPT + 99 others); Thu, 1 Sep 2022 09:24:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234327AbiIANYL (ORCPT ); Thu, 1 Sep 2022 09:24:11 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0CCE1DA4F; Thu, 1 Sep 2022 06:24:00 -0700 (PDT) Received: from canpemm500005.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MJMBf4dwJznTsB; Thu, 1 Sep 2022 21:21:30 +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; Thu, 1 Sep 2022 21:23:57 +0800 From: Zhang Yi To: , , , , , , , CC: , , , , , , , , , , , , Subject: [PATCH v2 01/14] fs/buffer: remove __breadahead_gfp() Date: Thu, 1 Sep 2022 21:34:52 +0800 Message-ID: <20220901133505.2510834-2-yi.zhang@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220901133505.2510834-1-yi.zhang@huawei.com> References: <20220901133505.2510834-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 Reviewed-by: Jan Kara --- 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