]> granicus.if.org Git - zfs/commitdiff
Clear QUEUE_FLAG_ADD_RANDOM on zvols
authorRichard Yao <ryao@gentoo.org>
Sat, 29 Aug 2015 16:49:55 +0000 (12:49 -0400)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Sun, 30 Aug 2015 17:11:57 +0000 (10:11 -0700)
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 <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3713

module/zfs/zvol.c

index 3cce00fb686eed77c07107bcaabbd9e731e2730c..0c6cddef4205890d9b9ef56c3b1dda6f805c864f 100644 (file)
@@ -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)