From patchwork Tue May 28 05:33:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 13676142 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2A264CB2B for ; Tue, 28 May 2024 05:34:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716874459; cv=none; b=WDGNEMUhUTejc3KAom5xeq7MC/q6mUs1WlvylpZeWCj0somdtVYFokArczW4H65GTh7PAD49kUVzkAsamTa1RvrjjIKviGbeYlA0SgRl3tPCdLk5+QHcbP8Nmjfa3gbaIT/gInC+o8+oogvICNx4gP3yI3Wj7zG5ep/6RMnYZj0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716874459; c=relaxed/simple; bh=Ww6MS2mW1taFaROmhOKPMk9Nn1c1wC2CsYuDHGRGcoc=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ryLlY+ZxgmGZKCVaT5JBRfVD+7rG2GhKh1r2NNEvz5Sqsn/JLFpEMOiDH0YM7K4SS+uFQYAjZWpvQQNEkHwF07y5ZGoNX/G9xpzoz7D7aTymu5rXdG051uPD704rYKEMrAKadIR5dGOpHjEQLU2Uv9Uc1fwVYrjB+hCwUpVsjrs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=S3CLV+aV; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=f8C7JTAx; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="S3CLV+aV"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="f8C7JTAx" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 27FE622576 for ; Tue, 28 May 2024 05:34:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1716874454; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h+jKJEd0zW/pkXaH7aUWF0hxffUb+dZxQUSdaoAY9lw=; b=S3CLV+aVOhoauqdNRocS5SBKyqHquQjdIzZPFwf+dQE27eVOxu0jMSecVHA5LLvJgXgMIU PbQRGM46sZGn/QBUpS/op7UK6rDLEw89DKSnqCq/O8+6l+R2ECUwKTYzaNyBn55QT7JcGr HPBbAA2By6KgqqPha4fuCc3uuPaJ+ds= Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=f8C7JTAx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1716874453; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h+jKJEd0zW/pkXaH7aUWF0hxffUb+dZxQUSdaoAY9lw=; b=f8C7JTAxkxu9yutpB/n07T7Vd2kG1cuXkXns+m5NcPwVQey9YTinprIocPy83MyoTv8mIA 6lLeAhJgtH2+qUKXdOzQb/+P4k8GhkeTr24pgZlhWQX+z4MX8GWJriu7tw3nKUE7OddLJo V2mdgE8HLoGHDCmVBsSN2OROYE04J98= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 34BE113A55 for ; Tue, 28 May 2024 05:34:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id wK5kNtNsVWYpdAAAD6G6ig (envelope-from ) for ; Tue, 28 May 2024 05:34:11 +0000 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH 1/2] btrfs: cleanup recursive include of the same header Date: Tue, 28 May 2024 15:03:47 +0930 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Flag: NO X-Spam-Score: -5.01 X-Rspamd-Action: no action X-Rspamd-Queue-Id: 27FE622576 X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-5.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; DWL_DNSWL_MED(-2.00)[suse.com:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[linux-btrfs@vger.kernel.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_NONE(0.00)[]; DKIM_TRACE(0.00)[suse.com:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[] We have several headers that are including themselves, triggering clangd warnings. Just remove such unnecessary include. Signed-off-by: Qu Wenruo Reviewed-by: Filipe Manana --- fs/btrfs/btrfs_inode.h | 1 - fs/btrfs/extent_map.h | 1 - fs/btrfs/fs.h | 1 - fs/btrfs/locking.h | 1 - fs/btrfs/lru_cache.h | 1 - 5 files changed, 5 deletions(-) diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index 97ce56a60672..08828e1ea1f7 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -19,7 +19,6 @@ #include #include #include "block-rsv.h" -#include "btrfs_inode.h" #include "extent_map.h" #include "extent_io.h" #include "extent-io-tree.h" diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h index 2bcf7149b44c..d3d1e5b7528d 100644 --- a/fs/btrfs/extent_map.h +++ b/fs/btrfs/extent_map.h @@ -9,7 +9,6 @@ #include #include #include "misc.h" -#include "extent_map.h" #include "compression.h" struct btrfs_inode; diff --git a/fs/btrfs/fs.h b/fs/btrfs/fs.h index 89f0650631cd..e6b1903f6c32 100644 --- a/fs/btrfs/fs.h +++ b/fs/btrfs/fs.h @@ -29,7 +29,6 @@ #include "extent-io-tree.h" #include "async-thread.h" #include "block-rsv.h" -#include "fs.h" struct inode; struct super_block; diff --git a/fs/btrfs/locking.h b/fs/btrfs/locking.h index 1bc8e6738879..3c15c75e0582 100644 --- a/fs/btrfs/locking.h +++ b/fs/btrfs/locking.h @@ -11,7 +11,6 @@ #include #include #include "extent_io.h" -#include "locking.h" struct extent_buffer; struct btrfs_path; diff --git a/fs/btrfs/lru_cache.h b/fs/btrfs/lru_cache.h index e32906ab6faa..07f1bb1c6aa3 100644 --- a/fs/btrfs/lru_cache.h +++ b/fs/btrfs/lru_cache.h @@ -6,7 +6,6 @@ #include #include #include -#include "lru_cache.h" /* * A cache entry. This is meant to be embedded in a structure of a user of From patchwork Tue May 28 05:33:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 13676141 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F29F41C6B8 for ; Tue, 28 May 2024 05:34:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716874458; cv=none; b=lEluyBvlEt3I0NDKegwbNkUMO5YBRuvN/EqB/a4P197npKzMCK/LvytA2OGdGrFWK+Evs35PwJ4vM0iI7lkQo4KfqL7/YfjXiGgD/BQvq802WIiuX4wysqyw/7p94PJQnG7mzlmIo4Y2JCclBt4IXC0STDM5ng6CXPAoUbeAw/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716874458; c=relaxed/simple; bh=H62UNhUr2ho2tGYnGoB9tHfr5LPu4BXJhA/8L2YQJYU=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ry7bsJ6Ju86GVisOS2BCpxVT8z4aw4L+yL67hOEfE/lIqBKVVR3UQcB3MN2t0wQjjtALarcD97yGNOmS1odKUJ2qr6Dm/D4gGOFjzJxF5vhl1jmqFyMi73G+42L+TpOK9VQen5+8Br4SfCytoOo8vjDAfkwDsJMonmCOnxSEdF8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=HxRmq567; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=HxRmq567; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="HxRmq567"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="HxRmq567" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id A8E2122577 for ; Tue, 28 May 2024 05:34:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1716874454; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1o44RJwaTTXjliuIppS+DKbu3LMr1k6xJs7OqEK/RZY=; b=HxRmq567+D2Ev87JQGNF683uV9t4oqQPNkcaVex/ZUsoh+CNkkobc07ct8z5REBWUOCmhe p4F5I2VcFLVP+jWoC20y8Io5YLwxBipbiQwmpjudt1Js3+3yYgUm/5TchXixcMEXFpXKTl hmaUDOJTTheyRug+L8gUmUHjT0jtHKY= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1716874454; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1o44RJwaTTXjliuIppS+DKbu3LMr1k6xJs7OqEK/RZY=; b=HxRmq567+D2Ev87JQGNF683uV9t4oqQPNkcaVex/ZUsoh+CNkkobc07ct8z5REBWUOCmhe p4F5I2VcFLVP+jWoC20y8Io5YLwxBipbiQwmpjudt1Js3+3yYgUm/5TchXixcMEXFpXKTl hmaUDOJTTheyRug+L8gUmUHjT0jtHKY= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id B7D4013A83 for ; Tue, 28 May 2024 05:34:13 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 6LKpGtVsVWYpdAAAD6G6ig (envelope-from ) for ; Tue, 28 May 2024 05:34:13 +0000 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH 2/2] btrfs: do not directly rwlock_types.h Date: Tue, 28 May 2024 15:03:48 +0930 Message-ID: <1c461e2717312cb530377a519316a8c64cd13c09.1716874214.git.wqu@suse.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Flag: NO X-Spam-Score: -2.80 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; PREVIOUSLY_DELIVERED(0.00)[linux-btrfs@vger.kernel.org]; TO_DN_NONE(0.00)[]; FROM_HAS_DN(0.00)[] There is already an error inside that header: #if !defined(__LINUX_SPINLOCK_TYPES_H) # error "Do not include directly, include spinlock_types.h" #endif Thankfully it never get triggered as some other headers have already included spinlock_types.h. However clangd would still do a proper warning on that if only extent_map.h is opened. Fix it by using spinlock_types.h instead. Signed-off-by: Qu Wenruo Reviewed-by: Filipe Manana --- fs/btrfs/extent_map.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h index d3d1e5b7528d..5154a8f1d26c 100644 --- a/fs/btrfs/extent_map.h +++ b/fs/btrfs/extent_map.h @@ -4,7 +4,7 @@ #define BTRFS_EXTENT_MAP_H #include -#include +#include #include #include #include