From: Andreas Dilger <adilger@whamcloud.com>
To: Andy Whitcroft <apw@canonical.com>, Joe Perches <joe@perches.com>
Cc: linux-kernel@vger.kernel.org, Andreas Dilger <adilger@dilger.ca>
Subject: [PATCH] checkpatch: ignore deleted lines for comment context
Date: Fri, 22 Dec 2023 16:05:51 -0700 [thread overview]
Message-ID: <20231222230551.95425-1-adilger@whamcloud.com> (raw)
From: Andreas Dilger <adilger@dilger.ca>
Don't consider lines being removed by a patch as part of a comment.
Otherwise, false "WARNING: memory barrier without comment" and similar
issues can be reported when a comment does exist on the previous line.
For example, a change like below was previously incorrectly flagged:
/* matched by smp_store_release() in some_function() */
- if (smp_load_acquire(&list->tail) == head))
+ if (smp_load_acquire(&list->tail) == head) && flags == 0)
Signed-off-by: Andreas Dilger <adilger@dilger.ca>
---
scripts/checkpatch.pl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 25fdb7fda112..272e30b8adbe 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1972,7 +1972,8 @@ sub ctx_locate_comment {
$current_comment = '';
for (my $linenr = $first_line; $linenr < $end_line; $linenr++) {
my $line = $rawlines[$linenr - 1];
- #warn " $line\n";
+ #warn "LINE($linenr): $line\n";
+ next if ($line =~ /^-/); # ignore lines removed by patch
if ($linenr == $first_line and $line =~ m@^.\s*\*@) {
$in_comment = 1;
}
--
2.25.1
next reply other threads:[~2023-12-22 23:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-22 23:05 Andreas Dilger [this message]
2023-12-22 23:15 ` Joe Perches
2023-12-22 23:22 ` Andreas Dilger
2025-07-17 1:11 Andreas Dilger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231222230551.95425-1-adilger@whamcloud.com \
--to=adilger@whamcloud.com \
--cc=adilger@dilger.ca \
--cc=apw@canonical.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®