tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

libceph: remove osdtimeout option entirely

Commit 83aff95eb9d6 ("libceph: remove 'osdtimeout' option") deprecated
osdtimeout over 8 years ago, but it is still recognized. Let's remove
it entirely.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>

Ilya Dryomov d7ef2e59 afd56e78

-6
-6
net/ceph/ceph_common.c
··· 252 252 * ceph options 253 253 */ 254 254 enum { 255 - Opt_osdtimeout, 256 255 Opt_osdkeepalivetimeout, 257 256 Opt_mount_timeout, 258 257 Opt_osd_idle_ttl, ··· 319 320 fsparam_u32 ("osd_idle_ttl", Opt_osd_idle_ttl), 320 321 fsparam_u32 ("osd_request_timeout", Opt_osd_request_timeout), 321 322 fsparam_u32 ("osdkeepalive", Opt_osdkeepalivetimeout), 322 - __fsparam (fs_param_is_s32, "osdtimeout", Opt_osdtimeout, 323 - fs_param_deprecated, NULL), 324 323 fsparam_enum ("read_from_replica", Opt_read_from_replica, 325 324 ceph_param_read_from_replica), 326 325 fsparam_enum ("ms_mode", Opt_ms_mode, ··· 550 553 } 551 554 break; 552 555 553 - case Opt_osdtimeout: 554 - warn_plog(&log, "Ignoring osdtimeout"); 555 - break; 556 556 case Opt_osdkeepalivetimeout: 557 557 /* 0 isn't well defined right now, reject it */ 558 558 if (result.uint_32 < 1 || result.uint_32 > INT_MAX / 1000)