3.4-stable review patch. If anyone has any objections, please let me know.
------------------ From: Alex Elder <[email protected]> The "notify_timeout" rbd device option is never used, so get rid of it. Signed-off-by: Alex Elder <[email protected]> Reviewed-by: Yehuda Sadeh <[email protected]> (cherry picked from commit 84d34dcc116e117a41c6fc8be13430529fc2d9e7) Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/block/rbd.c | 8 -------- 1 file changed, 8 deletions(-) --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -71,7 +71,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 /* @@ -95,7 +94,6 @@ struct rbd_image_header { }; struct rbd_options { - int notify_timeout; bool read_only; }; @@ -343,7 +341,6 @@ static struct rbd_client *__rbd_client_f * mount options */ enum { - Opt_notify_timeout, Opt_last_int, /* int args above */ Opt_last_string, @@ -355,7 +352,6 @@ enum { }; static match_table_t rbdopt_tokens = { - {Opt_notify_timeout, "notify_timeout=%d"}, /* int args above */ /* string args above */ {Opt_read_only, "read_only"}, @@ -394,9 +390,6 @@ static int parse_rbd_opts_token(char *c, } switch (token) { - case Opt_notify_timeout: - rbdopt->notify_timeout = intval; - break; case Opt_read_only: rbdopt->read_only = true; break; @@ -425,7 +418,6 @@ static struct rbd_client *rbd_get_client if (!rbd_opts) return ERR_PTR(-ENOMEM); - rbd_opts->notify_timeout = RBD_NOTIFY_TIMEOUT_DEFAULT; rbd_opts->read_only = RBD_READ_ONLY_DEFAULT; opt = ceph_parse_options(options, mon_addr, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
