From patchwork Fri Aug 24 16:34:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1372171 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E93BCDF28C for ; Fri, 24 Aug 2012 16:34:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964805Ab2HXQex (ORCPT ); Fri, 24 Aug 2012 12:34:53 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:45658 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964839Ab2HXQex (ORCPT ); Fri, 24 Aug 2012 12:34:53 -0400 Received: by mail-iy0-f174.google.com with SMTP id o24so3735552ial.19 for ; Fri, 24 Aug 2012 09:34:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=DKF1pkJc9ZGk41az6OzXhA2g9paXmbwrpwcf2Bhjm8Q=; b=MMLOjvv/jd8xpnb1sR2ORNaFrZCkB5iwKm1gWtbZ7ZeKjHu2L/jVO+A7rA22FT8UuP Aa4oXu021EXqd2o8cv+++/3LtuCMvnrZ6chbVhLKnyibsUPfhE2cMbe6JaCRLA8rHj7Y jMwCRIqbEIm49zVnKht2He5VueNfcSdMQhtF8so6SKesjq4uAwPppBJBI0QrVWq8Yq/W FNyWHexzrvdcuX5xDtVJQ0AgNlt8MbrY2xwulJaQ/NB2KUwDsxVRVxGTi99lM/tBmuBI nn3kT8K2Wp1RgxUX/C35aS+J26NuNLw1QbWi+b83T030hVqKa0WbrpuPsqI5invA4z7s wBHA== Received: by 10.50.183.231 with SMTP id ep7mr2772147igc.66.1345826092807; Fri, 24 Aug 2012 09:34:52 -0700 (PDT) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id fu4sm247930igc.4.2012.08.24.09.34.48 (version=SSLv3 cipher=OTHER); Fri, 24 Aug 2012 09:34:49 -0700 (PDT) Message-ID: <5037AD28.4050805@inktank.com> Date: Fri, 24 Aug 2012 11:34:48 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 07/11] rbd: kill notify_timeout option References: <5037AB20.4000103@inktank.com> In-Reply-To: <5037AB20.4000103@inktank.com> X-Gm-Message-State: ALoCoQlawhoA+nxz4eXfw7drGN7i7uQyIn4Q/8eioidwq1XBZRvV8PmL69Il7ABCAZ2e2q+dlLmq Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org The "notify_timeout" rbd device option is never used, so get rid of it. Signed-off-by: Alex Elder Reviewed-by: Yehuda Sadeh --- drivers/block/rbd.c | 8 -------- 1 file changed, 8 deletions(-) Opt_last_string, @@ -359,7 +356,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"}, @@ -396,9 +392,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 = !rbd_opts->read_only; break; @@ -419,7 +412,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, diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 5e22bb5..e94336d 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 */