Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp296114pxf; Thu, 1 Apr 2021 01:06:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcrJuvf3NzMyVdcytBaCofKn/uyVDgrPa0zYAyzplZcIaMZz8MtWo4X9wsmGUY6F5uYrvy X-Received: by 2002:a50:d753:: with SMTP id i19mr8410483edj.43.1617264379958; Thu, 01 Apr 2021 01:06:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617264379; cv=none; d=google.com; s=arc-20160816; b=aitF+iqh5SK2dxfhAYHAq9VLAp6bPUYJIIpTieOhU9IaqrDPZ9YRSJkzClKV18DRhn Pfwnyt3o3AFuq78x0FLLSnhXBj9LkE05WLni23MLzio/pmjo2KICnxM+TnwNP+8n5qaK qx52s93vLfl1NuE4t6jkxbjj4VALk7+9ZJCNa53v+MftQOQp0iQg+Y5nhZViL0Rt2Ka5 6S6ZZU+vvehv1kPtCU+Yir3tbNECytgJpaVG/3jp0yu3rCkdtP7G+A7iQIJ4cRgK+DoP 7VkuFsBnMpnWxvd+62EoE085Py+J6bjkmfJ/yTGdpypNNMB66KOa+g8wxBLKc+C7sELz go6A== 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=fHgtbUUOV8tfg5hFXINAvSOg4UypLAIPRIsOmKcr+XI=; b=b02thEHvd7ZwI64qRtllDCoXUNEbeYKpT1MQbaK9hHldMtCTN4wcg9TG4qM7yMRpFn DSUbdNhXogaeJEnqG+Tzd8Tuq0q8czpDmSpNRvoHeqT5g0PmLGGiItFSbipQKks4BSUn o21f+j4qzLrftApP1A22JckU7Xs9F51T4FVWUVTiMI9psBMf/YIxesIPnrc/NUQqTBY0 LkvyHPwyFCXjYw3CT6VVk4ywRekfPGONAy2IHQTUUJrnrA8A3GeFE1y8oqJLESFVom1Z FSMCg0YWSqnp9VgtHTLl+Q+HmqbaAaT7tQYjAUR0rg4h246Htwfm4YbzhkOF+05MtIwe AeNw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h13si3575190edt.586.2021.04.01.01.05.57; Thu, 01 Apr 2021 01:06:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233185AbhDAIEW (ORCPT + 99 others); Thu, 1 Apr 2021 04:04:22 -0400 Received: from mail-m17637.qiye.163.com ([59.111.176.37]:8488 "EHLO mail-m17637.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230284AbhDAIDz (ORCPT ); Thu, 1 Apr 2021 04:03:55 -0400 Received: from wanjb-virtual-machine.localdomain (unknown [36.152.145.182]) by mail-m17637.qiye.163.com (Hmail) with ESMTPA id 1193D9804D8; Thu, 1 Apr 2021 16:03:52 +0800 (CST) From: Wan Jiabing To: Chris Mason , Josef Bacik , David Sterba , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kael_w@yeah.net, Wan Jiabing Subject: [PATCH] fs: btrfs: Remove repeated struct declaration Date: Thu, 1 Apr 2021 16:03:39 +0800 Message-Id: <20210401080339.999529-1-wanjiabing@vivo.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZTx5DSEMfSUwYGUtLVkpNSkxJTU9JSElISkpVEwETFhoSFyQUDg9ZV1kWGg8SFR0UWU FZT0tIVUpKS0hKTFVLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6ME06Axw6HD8UPCsrDEo3OR06 Li5PCUpVSlVKTUpMSU1PSUhJTUlDVTMWGhIXVQwaFRESGhkSFRw7DRINFFUYFBZFWVdZEgtZQVlI TVVKTklVSk9OVUpDSVlXWQgBWUFJS01LNwY+ X-HM-Tid: 0a788c75c728d992kuws1193d9804d8 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org struct btrfs_inode is declared twice. One is declared at 67th line. The blew declaration is not needed. Remove the duplicate. struct btrfs_fs_info should be declared in the forward declarations. Move it to the forward declarations. Signed-off-by: Wan Jiabing --- fs/btrfs/extent_io.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index 824640cb0ace..227215a5722c 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -66,6 +66,7 @@ enum { struct btrfs_root; struct btrfs_inode; struct btrfs_io_bio; +struct btrfs_fs_info; struct io_failure_record; struct extent_io_tree; @@ -270,9 +271,6 @@ struct bio *btrfs_io_bio_alloc(unsigned int nr_iovecs); struct bio *btrfs_bio_clone(struct bio *bio); struct bio *btrfs_bio_clone_partial(struct bio *orig, int offset, int size); -struct btrfs_fs_info; -struct btrfs_inode; - int repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start, u64 length, u64 logical, struct page *page, unsigned int pg_offset, int mirror_num); -- 2.25.1