Received-SPF: pass (google.com: domain of linux-kernel+bounces-10109-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <2b294dc33ea64d1d605cf146741d92677b13006a.camel@perches.com>
Subject: Re: [PATCH] checkpatch: ignore deleted lines for comment context
From: Joe Perches <joe@perches.com>
To: Andreas Dilger <adilger@whamcloud.com>, Andy Whitcroft
 <apw@canonical.com>
Cc: linux-kernel@vger.kernel.org, Andreas Dilger <adilger@dilger.ca>
Date: Fri, 22 Dec 2023 15:15:52 -0800
In-Reply-To: <20231222230551.95425-1-adilger@whamcloud.com>
References: <20231222230551.95425-1-adilger@whamcloud.com>
Content-Type: text/plain; charset="ISO-8859-1"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.48.4 (3.48.4-1.fc38) 
Precedence: bulk
MIME-Version: 1.0

On Fri, 2023-12-22 at 16:05 -0700, Andreas Dilger wrote:
> From: Andreas Dilger <adilger@dilger.ca>
>=20
> 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.
>=20
> For example, a change like below was previously incorrectly flagged:
>=20
> 	/* matched by smp_store_release() in some_function() */
>  -	if (smp_load_acquire(&list->tail) =3D=3D head))
>  +	if (smp_load_acquire(&list->tail) =3D=3D head) && flags =3D=3D 0)
>=20
> Signed-off-by: Andreas Dilger <adilger@dilger.ca>

OK, but:

> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
[]
> @@ -1972,7 +1972,8 @@ sub ctx_locate_comment {
>  	$current_comment =3D '';
>  	for (my $linenr =3D $first_line; $linenr < $end_line; $linenr++) {
>  		my $line =3D $rawlines[$linenr - 1];
> -		#warn "           $line\n";
> +		#warn "LINE($linenr): $line\n";

This is a superfluous change

> +		next if ($line =3D~ /^-/); # ignore lines removed by patch
>  		if ($linenr =3D=3D $first_line and $line =3D~ m@^.\s*\*@) {
>  			$in_comment =3D 1;
>  		}