GFP_NOWAIT already includes __GFP_NOWARN, so let's remove the redundant
__GFP_NOWARN.

Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
---
 drivers/md/bcache/btree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index 210b59007d98..a764ec149d7a 100644
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -371,7 +371,7 @@ static void do_btree_node_write(struct btree *b)
 	SET_PTR_OFFSET(&k.key, 0, PTR_OFFSET(&k.key, 0) +
 		       bset_sector_offset(&b->keys, i));
 
-	if (!bch_bio_alloc_pages(b->bio, __GFP_NOWARN|GFP_NOWAIT)) {
+	if (!bch_bio_alloc_pages(b->bio, GFP_NOWAIT)) {
 		struct bio_vec *bv;
 		void *addr = (void *) ((unsigned long) i & ~(PAGE_SIZE - 1));
 		struct bvec_iter_all iter_all;
-- 
2.34.1

On Mon, Aug 11, 2025 at 08:36:35PM +0800, Qianfeng Rong wrote:
> GFP_NOWAIT already includes __GFP_NOWARN, so let's remove the redundant
> __GFP_NOWARN.
> 
> Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>

Acked-by: Coly Li <colyli@kernel.org>

Do you want this patch to go upstream in my submission path?

Thanks.

Coly Li

> ---
>  drivers/md/bcache/btree.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
> index 210b59007d98..a764ec149d7a 100644
> --- a/drivers/md/bcache/btree.c
> +++ b/drivers/md/bcache/btree.c
> @@ -371,7 +371,7 @@ static void do_btree_node_write(struct btree *b)
>  	SET_PTR_OFFSET(&k.key, 0, PTR_OFFSET(&k.key, 0) +
>  		       bset_sector_offset(&b->keys, i));
>  
> -	if (!bch_bio_alloc_pages(b->bio, __GFP_NOWARN|GFP_NOWAIT)) {
> +	if (!bch_bio_alloc_pages(b->bio, GFP_NOWAIT)) {
>  		struct bio_vec *bv;
>  		void *addr = (void *) ((unsigned long) i & ~(PAGE_SIZE - 1));
>  		struct bvec_iter_all iter_all;
> -- 
> 2.34.1
>

在 2025/8/11 21:22, Coly Li 写道:
> On Mon, Aug 11, 2025 at 08:36:35PM +0800, Qianfeng Rong wrote:
>> GFP_NOWAIT already includes __GFP_NOWARN, so let's remove the redundant
>> __GFP_NOWARN.
>>
>> Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
> Acked-by: Coly Li <colyli@kernel.org>
>
> Do you want this patch to go upstream in my submission path?
Yes, please include this patch in your submission path to upstream.

Thank you for your review and Acked-by tag.

Best regards,
Qianfeng
>
> Thanks.
>
> Coly Li
>
>> ---
>>   drivers/md/bcache/btree.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
>> index 210b59007d98..a764ec149d7a 100644
>> --- a/drivers/md/bcache/btree.c
>> +++ b/drivers/md/bcache/btree.c
>> @@ -371,7 +371,7 @@ static void do_btree_node_write(struct btree *b)
>>   	SET_PTR_OFFSET(&k.key, 0, PTR_OFFSET(&k.key, 0) +
>>   		       bset_sector_offset(&b->keys, i));
>>   
>> -	if (!bch_bio_alloc_pages(b->bio, __GFP_NOWARN|GFP_NOWAIT)) {
>> +	if (!bch_bio_alloc_pages(b->bio, GFP_NOWAIT)) {
>>   		struct bio_vec *bv;
>>   		void *addr = (void *) ((unsigned long) i & ~(PAGE_SIZE - 1));
>>   		struct bvec_iter_all iter_all;
>> -- 
>> 2.34.1
>>