From patchwork Thu Feb 1 12:22:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Lobakin X-Patchwork-Id: 195280 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2719:b0:106:209c:c626 with SMTP id hl25csp112036dyb; Thu, 1 Feb 2024 04:28:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IEY9oQI9HShWMsI2iQIddbcUJ2wUHzTrqTi5O0kCOiRmHPrClH06CGDiyX0sLIrFWqeCaK4 X-Received: by 2002:a17:906:e09a:b0:a36:8802:ffc7 with SMTP id gh26-20020a170906e09a00b00a368802ffc7mr3513734ejb.4.1706790488267; Thu, 01 Feb 2024 04:28:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706790488; cv=pass; d=google.com; s=arc-20160816; b=VJDBWlTm3ze4gkuEADsGS5Uw5V4cKb8Cb82MuUjRT3BjENncMTA9t7P5BDr3jpsPwy MxZFqOPwiiqrRMDJBMqt4/fwfXklsC0qoLWqKnnnJedny3bX1e3sDqmsTMaFkUf/B+0w gR/ffuO4D/hKY8KY/d8Ks0BCqaTKl84FlKe1S589XrfbTcYUMfg2hs0Tv+hhVjWRwduT mffnWgqnnGKKmSMQQwWhgn0ei5oYNgEeUsVE8CiFRsFchsv5Qy9hKj9svhF3OYnkt89J U64DYGClg/JncSB+a+L3d5EGh5iONQvVaoLbKKRNXZFNyDZUdLcXox+Fs/PWMFXAB/9b G4tg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=mHMANswgpt+5n/zqH1KebSY/4PT4nrB4Dos0sw0QSO4=; fh=9mQ5s+4JtcyFGbyfKftzniNAGxahwKOMJslWQ4FNJvI=; b=pMG9H38PGpFtmjROCSyHE1T8jJpD3tWB40nNDG7di1BuJiMWcmZnUakbeJkqyrmqLz Oa+YgLGOfI1fqVP52RRTzhmBt98yr6wf/T0dhK1iSeWCfymB9EUCmlTvOv4n2rYq8ly8 niNnws3vryBF7ogVIxhMI8Zs0B5OGQpDc7VMOM7hybB/1Zqo09QREwHaBDWZ89ad6/Nv 9O0b4sxWbdwfeHHGJ7V91eK2KpN2ztZ4MQY3z4O8WAyAWhCs7wvWbRav6/VAQ8oPVeDt ccJFOZKkM2xMDJcZbnnlfIyZTAlyndhLFuVdICmYWaya6jWFVKUauMmgDdNvoAT1VhM0 pVAg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=By9L0e9J; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-48122-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48122-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Forwarded-Encrypted: i=1; AJvYcCWPwujkMDQ6zf8DzNlmnGqsNL8YVll7UpGlZV1eIELNnTJA1Ey0xAVO2SPJp+UkCaOza8nJ7CW5gASAqVcUDSC/t+4tIA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id q18-20020a170906b29200b00a36730b50acsi1634275ejz.348.2024.02.01.04.28.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 04:28:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-48122-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=By9L0e9J; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-48122-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48122-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id D99EA1F23672 for ; Thu, 1 Feb 2024 12:28:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 96C5A5CDEA; Thu, 1 Feb 2024 12:24:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="By9L0e9J" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A07016086B; Thu, 1 Feb 2024 12:24:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706790265; cv=none; b=P2102AXeTulv7jXUxgHj9YtLn6DUzTzseHDPPDZhYrOySf2vCu4EJvzXEK7osVie6DcDPECzYz5wVXNX7GfhSTlyXQjo/PSqISWswAFWufucUNSwD5/5zkapow3l5Zhi8+8KoHiO0eqx//c8OKRH/1397QkesT5+4rWuyLtkdGI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706790265; c=relaxed/simple; bh=e3PhzQpSUJrSBLo17HbDTH0gB03sLbkzrAZOLsNo208=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=idRo/RIdblSW1Hll0y6LR/uL0r8apu2QRpcSB6/hn3O3i57jO7n0x3dphEFU7yBDA7jmg9ecwtG0WeW8h5qCG9DgfvUKyrMc/O3I0EAiJu/kKF4CW04xJmC/vc6h8GTtPX30EuUjualJbwRpGWcMgW6nhn89xGAA4WYIN5ltBCU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=By9L0e9J; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706790264; x=1738326264; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=e3PhzQpSUJrSBLo17HbDTH0gB03sLbkzrAZOLsNo208=; b=By9L0e9JNyOBSz1OYirC3ozKnHwnle2dcIO9372qRnCcr5seLQhY8egU WJ290pJWUXjvaGz7Set5uFLFdCLD3V75iBOKhJS1GY5UQk7AUOyWIzMV0 j3Try2X7c6PdNoNxCUDkMSn4F2rzmPpmR1jMY8f11EcHOV2oMBzzQQ4P1 9bWBv8LN8IZDkWNBVRdy8ipo0uHMXLUdH4VXnK7CfZjEvpxg0+fmE2YBk 54nO0SEaT+iDb99wMwYNoGalzRiW8ayL8BQCUJ2QtU3CaBt+6JbfIm7XO KJIVvmxSVg0sfedmdU+eSzrbH6ag/1y1RSCfogjffrcWEsT4vXZE1P5Db Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10969"; a="3747070" X-IronPort-AV: E=Sophos;i="6.05,234,1701158400"; d="scan'208";a="3747070" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Feb 2024 04:24:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,234,1701158400"; d="scan'208";a="4499119" Received: from newjersey.igk.intel.com ([10.102.20.203]) by orviesa004.jf.intel.com with ESMTP; 01 Feb 2024 04:24:18 -0800 From: Alexander Lobakin To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Alexander Lobakin , Michal Swiatkowski , Marcin Szycik , Wojciech Drewek , Yury Norov , Andy Shevchenko , Rasmus Villemoes , Alexander Potapenko , Jiri Pirko , Ido Schimmel , Przemek Kitszel , Simon Horman , linux-btrfs@vger.kernel.org, dm-devel@redhat.com, ntfs3@lists.linux.dev, linux-s390@vger.kernel.org, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, David Sterba Subject: [PATCH net-next v5 10/21] btrfs: rename bitmap_set_bits() -> btrfs_bitmap_set_bits() Date: Thu, 1 Feb 2024 13:22:05 +0100 Message-ID: <20240201122216.2634007-11-aleksander.lobakin@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240201122216.2634007-1-aleksander.lobakin@intel.com> References: <20240201122216.2634007-1-aleksander.lobakin@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789699543246356118 X-GMAIL-MSGID: 1789699543246356118 bitmap_set_bits() does not start with the FS' prefix and may collide with a new generic helper one day. It operates with the FS-specific types, so there's no change those two could do the same thing. Just add the prefix to exclude such possible conflict. Reviewed-by: Przemek Kitszel Acked-by: David Sterba Signed-off-by: Alexander Lobakin Reviewed-by: Yury Norov --- fs/btrfs/free-space-cache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index d372c7ce0e6b..47c979c3e67e 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -1913,9 +1913,9 @@ static inline void bitmap_clear_bits(struct btrfs_free_space_ctl *ctl, ctl->free_space -= bytes; } -static void bitmap_set_bits(struct btrfs_free_space_ctl *ctl, - struct btrfs_free_space *info, u64 offset, - u64 bytes) +static void btrfs_bitmap_set_bits(struct btrfs_free_space_ctl *ctl, + struct btrfs_free_space *info, u64 offset, + u64 bytes) { unsigned long start, count, end; int extent_delta = 1; @@ -2251,7 +2251,7 @@ static u64 add_bytes_to_bitmap(struct btrfs_free_space_ctl *ctl, bytes_to_set = min(end - offset, bytes); - bitmap_set_bits(ctl, info, offset, bytes_to_set); + btrfs_bitmap_set_bits(ctl, info, offset, bytes_to_set); return bytes_to_set;