Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84d34dcc authored by Alex Elder's avatar Alex Elder
Browse files

rbd: kill notify_timeout option 



The "notify_timeout" rbd device option is never used, so get rid of
it.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarYehuda Sadeh <yehuda@inktank.com>
parent cc0538b6

drivers/block/rbd.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -69,7 +69,6 @@ 
#define DEV_NAME_LEN		32

#define DEV_NAME_LEN		32

#define MAX_INT_FORMAT_WIDTH	((5 * sizeof (int)) / 2 + 1)

#define MAX_INT_FORMAT_WIDTH	((5 * sizeof (int)) / 2 + 1)





#define RBD_NOTIFY_TIMEOUT_DEFAULT	10

#define RBD_READ_ONLY_DEFAULT		false

#define RBD_READ_ONLY_DEFAULT		false





/*

/*
@@ -91,7 +90,6 @@ struct rbd_image_header { 
};

};





struct rbd_options {

struct rbd_options {

	int	notify_timeout;

	bool	read_only;

	bool	read_only;

};

};
@@ -348,7 +346,6 @@ static struct rbd_client *rbd_client_find(struct ceph_options *ceph_opts) 
 * mount options

 * mount options

 */

 */

enum {

enum {

	Opt_notify_timeout,

	Opt_last_int,

	Opt_last_int,

	/* int args above */

	/* int args above */

	Opt_last_string,

	Opt_last_string,
@@ -360,7 +357,6 @@ enum { 
};

};





static match_table_t rbd_opts_tokens = {

static match_table_t rbd_opts_tokens = {

	{Opt_notify_timeout, "notify_timeout=%d"},

	/* int args above */

	/* int args above */

	/* string args above */

	/* string args above */

	{Opt_read_only, "read_only"},

	{Opt_read_only, "read_only"},
@@ -399,9 +395,6 @@ static int parse_rbd_opts_token(char *c, void *private) 
	}

	}





	switch (token) {

	switch (token) {

	case Opt_notify_timeout:

		rbd_opts->notify_timeout = intval;

		break;

	case Opt_read_only:

	case Opt_read_only:

		rbd_opts->read_only = true;

		rbd_opts->read_only = true;

		break;

		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 ceph_options *ceph_opts;

	struct rbd_client *rbdc;

	struct rbd_client *rbdc;





	rbd_opts->notify_timeout = RBD_NOTIFY_TIMEOUT_DEFAULT;

	rbd_opts->read_only = RBD_READ_ONLY_DEFAULT;

	rbd_opts->read_only = RBD_READ_ONLY_DEFAULT;





	ceph_opts = ceph_parse_options(options, mon_addr,

	ceph_opts = ceph_parse_options(options, mon_addr,