Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4d21a18 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "block,blkcg: use __GFP_NOWARN for best-effort allocations in blkcg"

parents 1112136e 365b3e64

block/blk-cgroup.c

+5 −4
Original line number Diff line number Diff line
@@ -185,7 +185,8 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg, 
	}



	wb_congested = wb_congested_get_create(&q->backing_dev_info,

					       blkcg->css.id, GFP_NOWAIT);

					       blkcg->css.id,

					       GFP_NOWAIT | __GFP_NOWARN);

	if (!wb_congested) {

		ret = -ENOMEM;

		goto err_put_css;
@@ -193,7 +194,7 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg, 


	/* allocate */

	if (!new_blkg) {

		new_blkg = blkg_alloc(blkcg, q, GFP_NOWAIT);

		new_blkg = blkg_alloc(blkcg, q, GFP_NOWAIT | __GFP_NOWARN);

		if (unlikely(!new_blkg)) {

			ret = -ENOMEM;

			goto err_put_congested;
@@ -1022,7 +1023,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) 
	}



	spin_lock_init(&blkcg->lock);

	INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_NOWAIT);

	INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_NOWAIT | __GFP_NOWARN);

	INIT_HLIST_HEAD(&blkcg->blkg_list);

#ifdef CONFIG_CGROUP_WRITEBACK

	INIT_LIST_HEAD(&blkcg->cgwb_list);
@@ -1240,7 +1241,7 @@ int blkcg_activate_policy(struct request_queue *q, 
		if (blkg->pd[pol->plid])

			continue;



		pd = pol->pd_alloc_fn(GFP_NOWAIT, q->node);

		pd = pol->pd_alloc_fn(GFP_NOWAIT | __GFP_NOWARN, q->node);

		if (!pd)

			swap(pd, pd_prealloc);

		if (!pd) {

block/cfq-iosched.c

+2 −1
Original line number Diff line number Diff line
@@ -3868,7 +3868,8 @@ cfq_get_queue(struct cfq_data *cfqd, bool is_sync, struct cfq_io_cq *cic, 
			goto out;

	}



	cfqq = kmem_cache_alloc_node(cfq_pool, GFP_NOWAIT | __GFP_ZERO,

	cfqq = kmem_cache_alloc_node(cfq_pool,

				     GFP_NOWAIT | __GFP_ZERO | __GFP_NOWARN,

				     cfqd->queue->node);

	if (!cfqq) {

		cfqq = &cfqd->oom_cfqq;