Commit e0ab61fa authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-remove-redundant-__gfp_nowarn' 

Qianfeng Rong says:

====================
net: remove redundant __GFP_NOWARN (part)

Commit 16f5dfbc ("gfp: include __GFP_NOWARN in GFP_NOWAIT") made
GFP_NOWAIT implicitly include __GFP_NOWARN.

Therefore, explicit __GFP_NOWARN combined with GFP_NOWAIT (e.g.,
`GFP_NOWAIT | __GFP_NOWARN`) is now redundant.  Let's clean up these
redundant flags across subsystems.

No functional changes.
====================

Link: https://patch.msgid.link/20250810072944.438574-1-rongqianfeng@vivo.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents bc4c0a48 7792232a

net/ipv4/tcp_cdg.c

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static void tcp_cdg_init(struct sock *sk) 
	/* We silently fall back to window = 1 if allocation fails. */

	if (window > 1)

		ca->gradients = kcalloc(window, sizeof(ca->gradients[0]),

					GFP_NOWAIT | __GFP_NOWARN);

					GFP_NOWAIT);

	ca->rtt_seq = tp->snd_nxt;

	ca->shadow_wnd = tcp_snd_cwnd(tp);

}

net/rds/ib_recv.c

+1 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ void rds_ib_recv_cqe_handler(struct rds_ib_connection *ic, 
		rds_ib_stats_inc(s_ib_rx_ring_empty);



	if (rds_ib_ring_low(&ic->i_recv_ring)) {

		rds_ib_recv_refill(conn, 0, GFP_NOWAIT | __GFP_NOWARN);

		rds_ib_recv_refill(conn, 0, GFP_NOWAIT);

		rds_ib_stats_inc(s_ib_rx_refill_from_cq);

	}

}