From patchwork Fri May 12 05:44:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiapeng Chong X-Patchwork-Id: 92946 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4878626vqo; Thu, 11 May 2023 23:07:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4tqcs+e71is3ouS4ZocuHrMVmKo1n0Or5zGU1N5WP5Z1Zgp7OpFvk+mZcb/A47eTDtUQdV X-Received: by 2002:a05:6a00:2da8:b0:647:776c:d19c with SMTP id fb40-20020a056a002da800b00647776cd19cmr14357070pfb.13.1683871624211; Thu, 11 May 2023 23:07:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683871624; cv=none; d=google.com; s=arc-20160816; b=L/kGXmC/Bwi3KMoE02PmOwQ9HW0P7cdAk8vF+iaqDAQ/IPC+pAnDdbyvNe0+QIw091 n8SuIP5LV3zuM2oMFMiRZKuan9S3PVZx1wX1VxTjsKunhZ6J3740/dTMls7KVIeTZ5xa P3RqmyMTBLP+3EK8AHX67uGv1PwwralmLP3EiJS9kdJx23RGMHKys8UIb9wHWLewb+6a pqrXsMd2t4spoe2fwPIzmrnsXG054X0ogGTlL2+06sOLi0/OMfnyr/iTJ5/A8TdQE3lj HN54ChRYuKm9ZC+IlCRhP2uU/S3bjsiilU4e0CLgvHVIso3hTwLxLJ+9Q2aZVF+Mmgob 96QQ== 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 :message-id:date:subject:cc:to:from; bh=8V1OJMUtCA7q/ylJwOMBaCjw65nNoDVf8fl/yME3T9w=; b=yDSiiTM1lIcdncFHMZHw9xAjzNb2R4z54sOVQsi24A45QJt9H1ViFfi3INF+yzWJW0 LfCN5XSax5DpVODWPzTjf2E8lIOMi44UiP4gb6f7LvnfrBuJ8EeX4wEij9HVmOB9573M 9VqmCNpM9c5vQuv0QKHcbvimYPNGmb3XpjLxAiR+DDYlCzPl274dmRm1MK5lAsuJxJVj 3LVVn1gBhGRNNqucUjG3VipUddthqsrG2WYZkhuAsBg5IHVC1Q2HYoFlKK7BREyYTW4r Mc8WhXN6qlnui+3nBmJlA7rhqmfX3Ro3Lqnwk0aKPgH/M1dyFGWs2e6iTbvs1X8mxqyB 3TDw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w1-20020aa79a01000000b006437c0538e9si9785995pfj.76.2023.05.11.23.06.42; Thu, 11 May 2023 23:07:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239924AbjELFpU (ORCPT + 99 others); Fri, 12 May 2023 01:45:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239720AbjELFpS (ORCPT ); Fri, 12 May 2023 01:45:18 -0400 Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C57A1731; Thu, 11 May 2023 22:45:17 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=jiapeng.chong@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0ViNqtb._1683870298; Received: from localhost(mailfrom:jiapeng.chong@linux.alibaba.com fp:SMTPD_---0ViNqtb._1683870298) by smtp.aliyun-inc.com; Fri, 12 May 2023 13:45:14 +0800 From: Jiapeng Chong To: clm@fb.com Cc: josef@toxicpanda.com, dsterba@suse.com, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jiapeng Chong , Abaci Robot Subject: [PATCH] btrfs: scrub: Remove some unused functions Date: Fri, 12 May 2023 13:44:57 +0800 Message-Id: <20230512054457.43501-1-jiapeng.chong@linux.alibaba.com> X-Mailer: git-send-email 2.20.1.7.g153144c MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_IN_DEF_SPF_WL 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-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765667372394778472?= X-GMAIL-MSGID: =?utf-8?q?1765667372394778472?= These functions are defined in the scrub.c file, but not called elsewhere, so delete these unused functions. fs/btrfs/scrub.c:553:20: warning: unused function 'scrub_stripe_index_and_offset'. fs/btrfs/scrub.c:543:19: warning: unused function 'scrub_nr_raid_mirrors'. Reported-by: Abaci Robot Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=4937 Signed-off-by: Jiapeng Chong --- fs/btrfs/scrub.c | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 836725a19661..6fd90c8fd64a 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -540,48 +540,6 @@ static void scrub_print_common_warning(const char *errstr, struct btrfs_device * btrfs_free_path(path); } -static inline int scrub_nr_raid_mirrors(struct btrfs_io_context *bioc) -{ - if (bioc->map_type & BTRFS_BLOCK_GROUP_RAID5) - return 2; - else if (bioc->map_type & BTRFS_BLOCK_GROUP_RAID6) - return 3; - else - return (int)bioc->num_stripes; -} - -static inline void scrub_stripe_index_and_offset(u64 logical, u64 map_type, - u64 full_stripe_logical, - int nstripes, int mirror, - int *stripe_index, - u64 *stripe_offset) -{ - int i; - - if (map_type & BTRFS_BLOCK_GROUP_RAID56_MASK) { - const int nr_data_stripes = (map_type & BTRFS_BLOCK_GROUP_RAID5) ? - nstripes - 1 : nstripes - 2; - - /* RAID5/6 */ - for (i = 0; i < nr_data_stripes; i++) { - const u64 data_stripe_start = full_stripe_logical + - (i * BTRFS_STRIPE_LEN); - - if (logical >= data_stripe_start && - logical < data_stripe_start + BTRFS_STRIPE_LEN) - break; - } - - *stripe_index = i; - *stripe_offset = (logical - full_stripe_logical) & - BTRFS_STRIPE_LEN_MASK; - } else { - /* The other RAID type */ - *stripe_index = mirror; - *stripe_offset = 0; - } -} - static int fill_writer_pointer_gap(struct scrub_ctx *sctx, u64 physical) { int ret = 0;