summaryrefslogtreecommitdiff
path: root/drivers/block/rbd.c
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-08-10 20:12:07 (GMT)
committerAlex Elder <elder@inktank.com>2012-10-01 19:30:50 (GMT)
commit84d34dcc116e117a41c6fc8be13430529fc2d9e7 (patch)
tree20f4f8f5a7069a4c30cc4edd6b4ee7a05a4b1cf9 /drivers/block/rbd.c
parentcc0538b62c839c2df7b9f8378bb37e3b35faa608 (diff)
downloadlinux-84d34dcc116e117a41c6fc8be13430529fc2d9e7.tar.xz
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/rbd.c')
-rw-r--r--drivers/block/rbd.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 2db51ce..cf44da8 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -69,7 +69,6 @@
#define DEV_NAME_LEN 32
#define MAX_INT_FORMAT_WIDTH ((5 * sizeof (int)) / 2 + 1)
-#define RBD_NOTIFY_TIMEOUT_DEFAULT 10
#define RBD_READ_ONLY_DEFAULT false
/*
@@ -91,7 +90,6 @@ struct rbd_image_header {
};
struct rbd_options {
- int notify_timeout;
bool read_only;
};
@@ -348,7 +346,6 @@ static struct rbd_client *rbd_client_find(struct ceph_options *ceph_opts)
* mount options
*/
enum {
- Opt_notify_timeout,
Opt_last_int,
/* int args above */
Opt_last_string,
@@ -360,7 +357,6 @@ enum {
};
static match_table_t rbd_opts_tokens = {
- {Opt_notify_timeout, "notify_timeout=%d"},
/* int args above */
/* string args above */
{Opt_read_only, "read_only"},
@@ -399,9 +395,6 @@ static int parse_rbd_opts_token(char *c, void *private)
}
switch (token) {
- case Opt_notify_timeout:
- rbd_opts->notify_timeout = intval;
- break;
case Opt_read_only:
rbd_opts->read_only = true;
break;
@@ -425,7 +418,6 @@ static int rbd_get_client(struct rbd_device *rbd_dev, const char *mon_addr,
struct ceph_options *ceph_opts;
struct rbd_client *rbdc;
- rbd_opts->notify_timeout = RBD_NOTIFY_TIMEOUT_DEFAULT;
rbd_opts->read_only = RBD_READ_ONLY_DEFAULT;
ceph_opts = ceph_parse_options(options, mon_addr,