linux-kernel - Re: [PATCH] bcachefs: Remove duplicate condition in return statement

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <f7zphgeldym3m6rdlygmfrzwlgpdqzptvv2bwrq2jotpt2yadp@y7vck65ft3qy>
Date: Sat, 22 Feb 2025 09:05:57 -0500
From: Kent Overstreet <kent.overstreet@...ux.dev>
To: Thorsten Blum <thorsten.blum@...ux.dev>
Cc: linux-bcachefs@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] bcachefs: Remove duplicate condition in return statement

On Sat, Feb 22, 2025 at 02:31:01PM +0100, Thorsten Blum wrote:
> The last two conditions in the return statement are identical. Remove
> one of them.
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@...ux.dev>
> ---
>  fs/bcachefs/extents.h | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/fs/bcachefs/extents.h b/fs/bcachefs/extents.h
> index 620b284aa34f..8afcf2c75015 100644
> --- a/fs/bcachefs/extents.h
> +++ b/fs/bcachefs/extents.h
> @@ -703,7 +703,6 @@ static inline bool bch2_extent_ptr_eq(struct bch_extent_ptr ptr1,
>  	return (ptr1.cached	== ptr2.cached &&
>  		ptr1.unwritten	== ptr2.unwritten &&
>  		ptr1.offset	== ptr2.offset &&
> -		ptr1.dev	== ptr2.dev &&
>  		ptr1.dev	== ptr2.dev);

Actually should have been checking gen:


>From b0e5e78f7e890c48b69e24d19e82597daa2d9cf0 Mon Sep 17 00:00:00 2001
From: Kent Overstreet <kent.overstreet@...ux.dev>
Date: Sat, 22 Feb 2025 09:05:36 -0500
Subject: [PATCH] bcachefs: fix bch2_extent_ptr_eq()

Signed-off-by: Kent Overstreet <kent.overstreet@...ux.dev>

diff --git a/fs/bcachefs/extents.h b/fs/bcachefs/extents.h
index 8fae6b23a341..ed160aaa9546 100644
--- a/fs/bcachefs/extents.h
+++ b/fs/bcachefs/extents.h
@@ -704,7 +704,7 @@ static inline bool bch2_extent_ptr_eq(struct bch_extent_ptr ptr1,
 		ptr1.unwritten	== ptr2.unwritten &&
 		ptr1.offset	== ptr2.offset &&
 		ptr1.dev	== ptr2.dev &&
-		ptr1.dev	== ptr2.dev);
+		ptr1.gen	== ptr2.gen);
 }
 
 void bch2_ptr_swab(struct bkey_s);