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

Commit b95ada55 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

cfq: don't register propio policy if !CONFIG_CFQ_GROUP_IOSCHED 



cfq has been registering zeroed blkio_poilcy_cfq if CFQ_GROUP_IOSCHED
is disabled.  This fortunately doesn't collide with blk-throtl as
BLKIO_POLICY_PROP is zero but is unnecessary and risky.  Just don't
register it if not enabled.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 32e380ae

block/cfq-iosched.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -3878,8 +3878,6 @@ static struct blkio_policy_type blkio_policy_cfq = { 
	},

	},

	.plid = BLKIO_POLICY_PROP,

	.plid = BLKIO_POLICY_PROP,

};

};

#else

static struct blkio_policy_type blkio_policy_cfq;

#endif

#endif





static int __init cfq_init(void)

static int __init cfq_init(void)
@@ -3910,14 +3908,17 @@ static int __init cfq_init(void) 
		return ret;

		return ret;

	}

	}





#ifdef CONFIG_CFQ_GROUP_IOSCHED

	blkio_policy_register(&blkio_policy_cfq);

	blkio_policy_register(&blkio_policy_cfq);



#endif

	return 0;

	return 0;

}

}





static void __exit cfq_exit(void)

static void __exit cfq_exit(void)

{

{

#ifdef CONFIG_CFQ_GROUP_IOSCHED

	blkio_policy_unregister(&blkio_policy_cfq);

	blkio_policy_unregister(&blkio_policy_cfq);

#endif

	elv_unregister(&iosched_cfq);

	elv_unregister(&iosched_cfq);

	kmem_cache_destroy(cfq_pool);

	kmem_cache_destroy(cfq_pool);

}

}