Skip to content

Commit fc61764

Browse files
robnbehlendorf
authored andcommitted
vdev_disk: remove zfs_vdev_scheduler option
It has existed as a warning since 0.8.3, 5+ years ago. I think people have had enough time. Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: George Melikov <[email protected]> Reviewed-by: Pavel Snajdr <[email protected]> Signed-off-by: Rob Norris <[email protected]> Closes #17376
1 parent 284580c commit fc61764

File tree

2 files changed

+0
-27
lines changed

2 files changed

+0
-27
lines changed

man/man4/zfs.4

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2411,10 +2411,6 @@ aarch64_neonx2 NEON with more unrolling Aarch64/64-bit ARMv8
24112411
powerpc_altivec Altivec PowerPC
24122412
.TE
24132413
.
2414-
.It Sy zfs_vdev_scheduler Pq charp
2415-
.Sy DEPRECATED .
2416-
Prints warning to kernel log for compatibility.
2417-
.
24182414
.It Sy zfs_zevent_len_max Ns = Ns Sy 512 Pq uint
24192415
Max event queue length.
24202416
Events in the queue can be viewed with

module/os/linux/zfs/vdev_disk.c

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,29 +1576,6 @@ vdev_ops_t vdev_disk_ops = {
15761576
.vdev_op_kobj_evt_post = vdev_disk_kobj_evt_post
15771577
};
15781578

1579-
/*
1580-
* The zfs_vdev_scheduler module option has been deprecated. Setting this
1581-
* value no longer has any effect. It has not yet been entirely removed
1582-
* to allow the module to be loaded if this option is specified in the
1583-
* /etc/modprobe.d/zfs.conf file. The following warning will be logged.
1584-
*/
1585-
static int
1586-
param_set_vdev_scheduler(const char *val, zfs_kernel_param_t *kp)
1587-
{
1588-
int error = param_set_charp(val, kp);
1589-
if (error == 0) {
1590-
printk(KERN_INFO "The 'zfs_vdev_scheduler' module option "
1591-
"is not supported.\n");
1592-
}
1593-
1594-
return (error);
1595-
}
1596-
1597-
static const char *zfs_vdev_scheduler = "unused";
1598-
module_param_call(zfs_vdev_scheduler, param_set_vdev_scheduler,
1599-
param_get_charp, &zfs_vdev_scheduler, 0644);
1600-
MODULE_PARM_DESC(zfs_vdev_scheduler, "I/O scheduler");
1601-
16021579
int
16031580
param_set_min_auto_ashift(const char *buf, zfs_kernel_param_t *kp)
16041581
{

0 commit comments

Comments
 (0)