diff options
author | Alex Elder <elder@inktank.com> | 2012-08-10 16:12:07 -0400 |
---|---|---|
committer | Alex Elder <elder@inktank.com> | 2012-10-01 15:30:50 -0400 |
commit | 84d34dcc116e117a41c6fc8be13430529fc2d9e7 (patch) | |
tree | 20f4f8f5a7069a4c30cc4edd6b4ee7a05a4b1cf9 /drivers/block | |
parent | cc0538b62c839c2df7b9f8378bb37e3b35faa608 (diff) |
rbd: kill notify_timeout option
The "notify_timeout" rbd device option is never used, so get rid of
it.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/rbd.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 2db51cef9560..cf44da832ca1 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
@@ -69,7 +69,6 @@ | |||
69 | #define DEV_NAME_LEN 32 | 69 | #define DEV_NAME_LEN 32 |
70 | #define MAX_INT_FORMAT_WIDTH ((5 * sizeof (int)) / 2 + 1) | 70 | #define MAX_INT_FORMAT_WIDTH ((5 * sizeof (int)) / 2 + 1) |
71 | 71 | ||
72 | #define RBD_NOTIFY_TIMEOUT_DEFAULT 10 | ||
73 | #define RBD_READ_ONLY_DEFAULT false | 72 | #define RBD_READ_ONLY_DEFAULT false |
74 | 73 | ||
75 | /* | 74 | /* |
@@ -91,7 +90,6 @@ struct rbd_image_header { | |||
91 | }; | 90 | }; |
92 | 91 | ||
93 | struct rbd_options { | 92 | struct rbd_options { |
94 | int notify_timeout; | ||
95 | bool read_only; | 93 | bool read_only; |
96 | }; | 94 | }; |
97 | 95 | ||
@@ -348,7 +346,6 @@ static struct rbd_client *rbd_client_find(struct ceph_options *ceph_opts) | |||
348 | * mount options | 346 | * mount options |
349 | */ | 347 | */ |
350 | enum { | 348 | enum { |
351 | Opt_notify_timeout, | ||
352 | Opt_last_int, | 349 | Opt_last_int, |
353 | /* int args above */ | 350 | /* int args above */ |
354 | Opt_last_string, | 351 | Opt_last_string, |
@@ -360,7 +357,6 @@ enum { | |||
360 | }; | 357 | }; |
361 | 358 | ||
362 | static match_table_t rbd_opts_tokens = { | 359 | static match_table_t rbd_opts_tokens = { |
363 | {Opt_notify_timeout, "notify_timeout=%d"}, | ||
364 | /* int args above */ | 360 | /* int args above */ |
365 | /* string args above */ | 361 | /* string args above */ |
366 | {Opt_read_only, "read_only"}, | 362 | {Opt_read_only, "read_only"}, |
@@ -399,9 +395,6 @@ static int parse_rbd_opts_token(char *c, void *private) | |||
399 | } | 395 | } |
400 | 396 | ||
401 | switch (token) { | 397 | switch (token) { |
402 | case Opt_notify_timeout: | ||
403 | rbd_opts->notify_timeout = intval; | ||
404 | break; | ||
405 | case Opt_read_only: | 398 | case Opt_read_only: |
406 | rbd_opts->read_only = true; | 399 | rbd_opts->read_only = true; |
407 | break; | 400 | break; |
@@ -425,7 +418,6 @@ static int rbd_get_client(struct rbd_device *rbd_dev, const char *mon_addr, | |||
425 | struct ceph_options *ceph_opts; | 418 | struct ceph_options *ceph_opts; |
426 | struct rbd_client *rbdc; | 419 | struct rbd_client *rbdc; |
427 | 420 | ||
428 | rbd_opts->notify_timeout = RBD_NOTIFY_TIMEOUT_DEFAULT; | ||
429 | rbd_opts->read_only = RBD_READ_ONLY_DEFAULT; | 421 | rbd_opts->read_only = RBD_READ_ONLY_DEFAULT; |
430 | 422 | ||
431 | ceph_opts = ceph_parse_options(options, mon_addr, | 423 | ceph_opts = ceph_parse_options(options, mon_addr, |