aboutsummaryrefslogtreecommitdiffstats
path: root/module/zfs
diff options
context:
space:
mode:
authorRichard Yao <[email protected]>2015-08-29 12:49:55 -0400
committerBrian Behlendorf <[email protected]>2015-08-30 10:11:57 -0700
commitc6a3a222d3a1d2af94205a218c0ba455200fb945 (patch)
treee6a24c73683912be1d6266c09f0c7d04445ae510 /module/zfs
parent3757bff3b155a4234905560167a0031cc4b0f746 (diff)
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 <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #3713
Diffstat (limited to 'module/zfs')
-rw-r--r--module/zfs/zvol.c3
1 files changed, 3 insertions, 0 deletions
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)