hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Tejun Heo <tj@kernel.org>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Tejun Heo 2012-03-05 13:14:55 -08:00 committed by Jens Axboe
parent 32e380aedc
commit b95ada558c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
block/cfq-iosched.c
View File

@ -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);
} }