mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] fs/ntfs3: Remove a useless test
@ 2021-12-23 12:20 Christophe JAILLET
  2022-06-07 15:58 ` Konstantin Komarov
  0 siblings, 1 reply; 2+ messages in thread
From: Christophe JAILLET @ 2021-12-23 12:20 UTC (permalink / raw)
  To: almaz.alexandrovich
  Cc: ntfs3, linux-kernel, kernel-janitors, Christophe JAILLET

'new_free' has just been allocated by kmalloc() and is known to be not
NULL.
So this pointer can't be equal to a previous memory allocation, or there
would be trouble in paradise.

Axe the always true test and make the code more readable.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 fs/ntfs3/bitmap.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/ntfs3/bitmap.c b/fs/ntfs3/bitmap.c
index aa184407520f..e3b5680fd516 100644
--- a/fs/ntfs3/bitmap.c
+++ b/fs/ntfs3/bitmap.c
@@ -1333,9 +1333,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits)
 		if (!new_free)
 			return -ENOMEM;
 
-		if (new_free != wnd->free_bits)
-			memcpy(new_free, wnd->free_bits,
-			       wnd->nwnd * sizeof(short));
+		memcpy(new_free, wnd->free_bits, wnd->nwnd * sizeof(short));
 		memset(new_free + wnd->nwnd, 0,
 		       (new_wnd - wnd->nwnd) * sizeof(short));
 		kfree(wnd->free_bits);
-- 
2.32.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] fs/ntfs3: Remove a useless test
  2021-12-23 12:20 [PATCH] fs/ntfs3: Remove a useless test Christophe JAILLET
@ 2022-06-07 15:58 ` Konstantin Komarov
  0 siblings, 0 replies; 2+ messages in thread
From: Konstantin Komarov @ 2022-06-07 15:58 UTC (permalink / raw)
  To: Christophe JAILLET; +Cc: ntfs3, linux-kernel, kernel-janitors



On 12/23/21 15:20, Christophe JAILLET wrote:
> 'new_free' has just been allocated by kmalloc() and is known to be not
> NULL.
> So this pointer can't be equal to a previous memory allocation, or there
> would be trouble in paradise.
> 
> Axe the always true test and make the code more readable.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>   fs/ntfs3/bitmap.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/fs/ntfs3/bitmap.c b/fs/ntfs3/bitmap.c
> index aa184407520f..e3b5680fd516 100644
> --- a/fs/ntfs3/bitmap.c
> +++ b/fs/ntfs3/bitmap.c
> @@ -1333,9 +1333,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits)
>   		if (!new_free)
>   			return -ENOMEM;
>   
> -		if (new_free != wnd->free_bits)
> -			memcpy(new_free, wnd->free_bits,
> -			       wnd->nwnd * sizeof(short));
> +		memcpy(new_free, wnd->free_bits, wnd->nwnd * sizeof(short));
>   		memset(new_free + wnd->nwnd, 0,
>   		       (new_wnd - wnd->nwnd) * sizeof(short));
>   		kfree(wnd->free_bits);

Thanks for patch, applied!

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-06-07 15:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-23 12:20 [PATCH] fs/ntfs3: Remove a useless test Christophe JAILLET
2022-06-07 15:58 ` Konstantin Komarov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome