From c6a3a222d3a1d2af94205a218c0ba455200fb945 Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Sat, 29 Aug 2015 12:49:55 -0400 Subject: [PATCH] Clear QUEUE_FLAG_ADD_RANDOM on zvols zvols should not be an entropy source for the kernel. Disable it to be consistent with the upstream kernel. torvalds/linux@b277da0a8a594308e17881f4926879bd5fca2a2d Signed-off-by: Richard Yao Signed-off-by: Brian Behlendorf Closes #3713 --- module/zfs/zvol.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c index 3cce00fb6..0c6cddef4 100644 --- a/module/zfs/zvol.c +++ b/module/zfs/zvol.c @@ -1427,6 +1427,9 @@ __zvol_create_minor(const char *name, boolean_t ignore_snapdev) #ifdef HAVE_BLK_QUEUE_NONROT queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zv->zv_queue); #endif +#ifdef QUEUE_FLAG_ADD_RANDOM + queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, zv->zv_queue); +#endif if (spa_writeable(dmu_objset_spa(os))) { if (zil_replay_disable)