Re: [PATCH 61/61] file: Drop unlikely() around IS_ERR_OR_NULL()

2026-03-10 Thread Jeff Layton 
On Tue, 2026-03-10 at 12:49 +0100, Philipp Hahn wrote:
> IS_ERR_OR_NULL() already uses likely(!ptr) internally. checkpatch does
> not like nesting it:
> > WARNING: nested (un)?likely() calls, IS_ERR_OR_NULL already uses
> > unlikely() internally
> Remove the explicit use of unlikely().
> 
> Change generated with coccinelle.
> 
> To: Christian Brauner 
> To: Jeff Layton 
> Cc: [email protected]
> Signed-off-by: Philipp Hahn 
> ---
>  include/linux/file.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/linux/file.h b/include/linux/file.h
> index 
> 27484b444d3155685cdbb89f546f26ef66e3e1b4..007b9b9d365a052c1c056e12571eaf4f8ef5a45c
>  100644
> --- a/include/linux/file.h
> +++ b/include/linux/file.h
> @@ -163,7 +163,7 @@ static inline void class_fd_prepare_destructor(const 
> struct fd_prepare *fdf)
>  {
>   if (unlikely(fdf->__fd >= 0))
>   put_unused_fd(fdf->__fd);
> - if (unlikely(!IS_ERR_OR_NULL(fdf->__file)))
> + if (!IS_ERR_OR_NULL(fdf->__file))
>   fput(fdf->__file);
>  }
>  

Reviewed-by: Jeff Layton

[PATCH 61/61] file: Drop unlikely() around IS_ERR_OR_NULL()

2026-03-10 Thread Philipp Hahn 
IS_ERR_OR_NULL() already uses likely(!ptr) internally. checkpatch does
not like nesting it:
> WARNING: nested (un)?likely() calls, IS_ERR_OR_NULL already uses
> unlikely() internally
Remove the explicit use of unlikely().

Change generated with coccinelle.

To: Christian Brauner 
To: Jeff Layton 
Cc: [email protected]
Signed-off-by: Philipp Hahn 
---
 include/linux/file.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/file.h b/include/linux/file.h
index 
27484b444d3155685cdbb89f546f26ef66e3e1b4..007b9b9d365a052c1c056e12571eaf4f8ef5a45c
 100644
--- a/include/linux/file.h
+++ b/include/linux/file.h
@@ -163,7 +163,7 @@ static inline void class_fd_prepare_destructor(const struct 
fd_prepare *fdf)
 {
if (unlikely(fdf->__fd >= 0))
put_unused_fd(fdf->__fd);
-   if (unlikely(!IS_ERR_OR_NULL(fdf->__file)))
+   if (!IS_ERR_OR_NULL(fdf->__file))
fput(fdf->__file);
 }
 

-- 
2.43.0