Skip to contentSkip to conversation

libceph: remove osdtimeout option entirely

PATCH In review Ilya Dryomov 2 participants 2 messages Jan 25, 2021 – Jan 26, 2021 Ceph common code (libceph)

lore
Share & tools
lore

Ilya Dryomov

author maintainer
#0 lore raw

PATCH 1/1 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.

---
 net/ceph/ceph_common.c | 6 ------
 1 file changed, 6 deletions(-)
net/ceph/ceph_common.c +0 -6
index bec181181d41..97d6ea763e32 100644
@@ -252,7 +252,6 @@ static int parse_fsid(const char *str, struct ceph_fsid *fsid)
  * ceph options
  */
 enum {
-	Opt_osdtimeout,
 	Opt_osdkeepalivetimeout,
 	Opt_mount_timeout,
 	Opt_osd_idle_ttl,
@@ -320,8 +319,6 @@ static const struct fs_parameter_spec ceph_parameters[] = {
 	fsparam_u32	("osd_idle_ttl",		Opt_osd_idle_ttl),
 	fsparam_u32	("osd_request_timeout",		Opt_osd_request_timeout),
 	fsparam_u32	("osdkeepalive",		Opt_osdkeepalivetimeout),
-	__fsparam	(fs_param_is_s32, "osdtimeout", Opt_osdtimeout,
-			 fs_param_deprecated, NULL),
 	fsparam_enum	("read_from_replica",		Opt_read_from_replica,
 			 ceph_param_read_from_replica),
 	fsparam_enum	("ms_mode",			Opt_ms_mode,
@@ -553,9 +550,6 @@ int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt,
 		}
 		break;
 
-	case Opt_osdtimeout:
-		warn_plog(&log, "Ignoring osdtimeout");
-		break;
 	case Opt_osdkeepalivetimeout:
 		/* 0 isn't well defined right now, reject it */
 		if (result.uint_32 < 1 || result.uint_32 > INT_MAX / 1000)
Signature · 1 line
2.19.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 38 lines · Ilya Dryomov

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

---
 net/ceph/ceph_common.c | 6 ------

 1 file changed, 6 deletions(-)
net/ceph/ceph_common.c +0 -3
index bec181181d41..97d6ea763e32 100644
@@ -252,7 +252,6 @@ static int parse_fsid(const char *str, struct ceph_fsid *fsid)
   * ceph options
   */
  enum {
-	Opt_osdtimeout,
  	Opt_osdkeepalivetimeout,
  	Opt_mount_timeout,
  	Opt_osd_idle_ttl,
@@ -320,8 +319,6 @@ static const struct fs_parameter_spec ceph_parameters[] = {
  	fsparam_u32	("osd_idle_ttl",		Opt_osd_idle_ttl),
  	fsparam_u32	("osd_request_timeout",		Opt_osd_request_timeout),
  	fsparam_u32	("osdkeepalive",		Opt_osdkeepalivetimeout),
-	__fsparam	(fs_param_is_s32, "osdtimeout", Opt_osdtimeout,
-			 fs_param_deprecated, NULL),
  	fsparam_enum	("read_from_replica",		Opt_read_from_replica,
  			 ceph_param_read_from_replica),
  	fsparam_enum	("ms_mode",			Opt_ms_mode,
@@ -553,9 +550,6 @@ int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt,
  		}
  		break;

net/ceph/ceph_common.c +0 -3
-	case Opt_osdtimeout:
-		warn_plog(&log, "Ignoring osdtimeout");
-		break;
Quoted 3 lines

  case Opt_osdkeepalivetimeout:
  /* 0 isn't well defined right now, reject it */ if (result.uint_32 < 1 || result.uint_32 > INT_MAX / 1000)