From mboxrd@z Thu Jan 1 00:00:00 1970 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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4CE7ACCD19A for ; Fri, 17 Oct 2025 09:06:17 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4cnzT362MRz3bW7; Fri, 17 Oct 2025 20:06:15 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=52.26.1.71 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1760691975; cv=none; b=QKqLeZpcmg4OhDi5O9fKf5tfEAhEA0QV7JOWtXTzfa1YuoHVjEtBmeP/Xi28saoWbyMg+eYUGKpvlqMk1sFM+g5AqmnM+qh0nEPZP3DHMuxXgO950gJNC/lLMjZY5Ln6QJUpuyaS6yyiZ6k/doFyfsACKF4qoE7SK5ieQ0ArtVgYA0OipYbvVKmUi02ud7b/qzIfq5AysetwgT7p+Q8Qf3RrKQFtBQIyQvrIuQgzg7OeUGdKQDXUcEx10FU7x8inZkaeQBQ9eqxdtvDt3tRopQGTB7OOMVIv+tRc17gR54DJBNS7jfw1s7rfUvtzF38uw/VJdG6D8a/euZkB6zb2BA== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1760691975; c=relaxed/relaxed; bh=LUfhSEtyrzlTvFjtMARdG8e1ebgK9JT+esac/DH/XMI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=L6zYM82d9bIY9DvV775ijy9wBP87bKHBkjJ+4uuFnMwQo73vC4QdpNeckfqP22/vECuAB743koPuiuqtoUiap1NnMfh8cE94jCGlFH7SyHkc5RuiGk4jFm5vnZWr1v/LXMwHab0lXJ1/JrVHsqF9Y73pnG6y3TCkUm6FU7ASSmEX/Wd0K5nUbcrJ7jbnVStXx//pV883jgCPCU0fWtOPzYWyR+KkKMAQRZMxZ1rd93AYwmv4kP5IWP5Jqq6fQ/s4CZM234okcelXVdjgISBOms06AYTdkNP9qEzVU8sVDbFb6+le+YPuhIXvC+gXTYfap+vvz/52d1iNYb0f2O3Njg== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com; dkim=pass (2048-bit key; unprotected) header.d=amazon.com header.i=@amazon.com header.a=rsa-sha256 header.s=amazoncorp2 header.b=Bi0Uyztz; dkim-atps=neutral; spf=pass (client-ip=52.26.1.71; helo=pdx-out-006.esa.us-west-2.outbound.mail-perimeter.amazon.com; envelope-from=prvs=378230090=farbere@amazon.com; receiver=lists.ozlabs.org) smtp.mailfrom=amazon.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=amazon.com header.i=@amazon.com header.a=rsa-sha256 header.s=amazoncorp2 header.b=Bi0Uyztz; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=amazon.com (client-ip=52.26.1.71; helo=pdx-out-006.esa.us-west-2.outbound.mail-perimeter.amazon.com; envelope-from=prvs=378230090=farbere@amazon.com; receiver=lists.ozlabs.org) Received: from pdx-out-006.esa.us-west-2.outbound.mail-perimeter.amazon.com (pdx-out-006.esa.us-west-2.outbound.mail-perimeter.amazon.com [52.26.1.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4cnzT26tf7z2xcB for ; Fri, 17 Oct 2025 20:06:14 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1760691975; x=1792227975; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LUfhSEtyrzlTvFjtMARdG8e1ebgK9JT+esac/DH/XMI=; b=Bi0UyztzDu+LV8UUmgJvjXYupp49FA6O4TNj4+0VY2RziLJNz7US4GHD KYSz26t0+KOQndk8fkG3KB8gD37npvfcXQ8lqG/Tshllu8XRniD9kvroJ I+UvN0aB6mmS7a1GeJMG8551EzqQ9Ckr9E4vZ9XgJ/Hp04/9sooO5zHN+ rHs7nJ5lAWWNPQVLmf7WvsWWGR4QDxMHMz7qALxgEqq95cHDwysZyeOf7 ewt2jLKRMQHUQR/3/qxHgbWitFvy7WCL8z39ptNYwJwZwY2vmPv6TWivC sWwHjLS+jSjmBhovLEjMWe+fBhbws7uzPHNErvzMH0DhsPSvQrxsT8HIG A==; X-CSE-ConnectionGUID: 81vXbaCaRnGCbaxjqgyfrw== X-CSE-MsgGUID: HnF/i6jVSpy9xn0uhETRhA== X-IronPort-AV: E=Sophos;i="6.18,281,1751241600"; d="scan'208";a="5073896" Received: from ip-10-5-0-115.us-west-2.compute.internal (HELO smtpout.naws.us-west-2.prod.farcaster.email.amazon.dev) ([10.5.0.115]) by internal-pdx-out-006.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 09:06:10 +0000 Received: from EX19MTAUWA001.ant.amazon.com [205.251.233.236:20862] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.18.50:2525] with esmtp (Farcaster) id 7be30397-534c-444c-a389-19ecfbe849c7; Fri, 17 Oct 2025 09:06:10 +0000 (UTC) X-Farcaster-Flow-ID: 7be30397-534c-444c-a389-19ecfbe849c7 Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWA001.ant.amazon.com (10.250.64.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Fri, 17 Oct 2025 09:06:09 +0000 Received: from dev-dsk-farbere-1a-46ecabed.eu-west-1.amazon.com (172.19.116.181) by EX19D001UWA001.ant.amazon.com (10.13.138.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Fri, 17 Oct 2025 09:05:54 +0000 From: Eliav Farber To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , CC: Johannes Thumshirn Subject: [PATCH v2 02/27 5.10.y] btrfs: remove duplicated in_range() macro Date: Fri, 17 Oct 2025 09:04:54 +0000 Message-ID: <20251017090519.46992-3-farbere@amazon.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251017090519.46992-1-farbere@amazon.com> References: <20251017090519.46992-1-farbere@amazon.com> X-Mailing-List: linux-erofs@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.19.116.181] X-ClientProxiedBy: EX19D045UWA003.ant.amazon.com (10.13.139.46) To EX19D001UWA001.ant.amazon.com (10.13.138.214) From: Johannes Thumshirn [ Upstream commit cea628008fc8c6c9c7b53902f6659e040f33c790 ] The in_range() macro is defined twice in btrfs' source, once in ctree.h and once in misc.h. Remove the definition in ctree.h and include misc.h in the files depending on it. Signed-off-by: Johannes Thumshirn Signed-off-by: David Sterba Signed-off-by: Eliav Farber --- fs/btrfs/ctree.h | 2 -- fs/btrfs/extent_io.c | 1 + fs/btrfs/file-item.c | 1 + fs/btrfs/raid56.c | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index d9d6a57acafe..a9926fb10c49 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3597,8 +3597,6 @@ static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info) return signal_pending(current); } -#define in_range(b, first, len) ((b) >= (first) && (b) < (first) + (len)) - /* Sanity test specific functions */ #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS void btrfs_test_destroy_inode(struct inode *inode); diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 8498994ef5c6..489d370ddd60 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -13,6 +13,7 @@ #include #include #include +#include "misc.h" #include "extent_io.h" #include "extent-io-tree.h" #include "extent_map.h" diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index cbea4f572155..6e46da3ee433 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c @@ -9,6 +9,7 @@ #include #include #include +#include "misc.h" #include "ctree.h" #include "disk-io.h" #include "transaction.h" diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index 9678d7fa4dcc..ed3e40a4a3cb 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -13,6 +13,7 @@ #include #include #include +#include "misc.h" #include "ctree.h" #include "disk-io.h" #include "volumes.h" -- 2.47.3