From patchwork Fri Oct 26 23:00:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1654381 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 D2DB7DF2F6 for ; Fri, 26 Oct 2012 23:00:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934210Ab2JZXA1 (ORCPT ); Fri, 26 Oct 2012 19:00:27 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:62618 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934127Ab2JZXA0 (ORCPT ); Fri, 26 Oct 2012 19:00:26 -0400 Received: by mail-ie0-f174.google.com with SMTP id k13so4483353iea.19 for ; Fri, 26 Oct 2012 16:00:26 -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=R3vcNGhz07E8ccq1pBiuYG6nu+5GzeItRq3h/pmIwqY=; b=g3b56jjHn/ULPwwkfyDBF6ckb90xfB652LlYN1c6ERaX4HGJNLAJzgtZSlUdfw2mgd mgnIzM4CPrGi9Mi/UYcBTjUUuGr8XoOl4Y4pjsaV4ioPsPLEr1AXXtSVofBCFzamg4jH //SG3S3JGUdvHkCTZVe3DnijKsSbf90NxPfiaaxc0XMw43SQPVD4OG1/9hQ0/J+qb52E soWLbJDK1ChMwmOyqFn6fNtFWnP/fONE6SrW/tNVq9UXYA0Sz15NQJTEPcBTgF13XlKZ j8MEppJyHx61jOM3efv/LAn1Vpr2t/B4ee/r0A2hPbp4JUJOpMJZoXYAxnIPWR8ZYeyc SN1A== Received: by 10.43.52.193 with SMTP id vn1mr20963490icb.5.1351292426360; Fri, 26 Oct 2012 16:00:26 -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 bh3sm209827igc.0.2012.10.26.16.00.11 (version=SSLv3 cipher=OTHER); Fri, 26 Oct 2012 16:00:25 -0700 (PDT) Message-ID: <508B15FA.7040008@inktank.com> Date: Fri, 26 Oct 2012 18:00:10 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 1/8] rbd: get rid of snap_name_len References: <508B11E3.3040108@inktank.com> <508B1505.20209@inktank.com> In-Reply-To: <508B1505.20209@inktank.com> X-Gm-Message-State: ALoCoQnegtQB9jIJbaF82Dm5F4P197zIKLRW99Jo5QGm0uN4fYxtJLsWWe5wxEEv9GQ98YeJvaFx Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org The value returned in the "snap_name_len" argument to rbd_add_parse_args() is never actually used, so get rid of it. The snap_name_len recorded in *rbd_dev_v2_snap_name() is not useful either, so get rid of that too. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) size = sizeof (__le32) + RBD_MAX_SNAP_NAME_LEN; @@ -2428,9 +2427,7 @@ static char *rbd_dev_v2_snap_name(struct rbd_device *rbd_dev, u32 which) p = reply_buf; end = (char *) reply_buf + size; - snap_name_len = 0; - snap_name = ceph_extract_encoded_string(&p, end, &snap_name_len, - GFP_KERNEL); + snap_name = ceph_extract_encoded_string(&p, end, NULL, GFP_KERNEL); if (IS_ERR(snap_name)) { ret = PTR_ERR(snap_name); goto out; @@ -2849,8 +2846,7 @@ static struct ceph_options *rbd_add_parse_args(struct rbd_device *rbd_dev, const char *buf, char *options, size_t options_size, - char **snap_name, - size_t *snap_name_len) + char **snap_name) { size_t len; const char *mon_addrs; @@ -2898,7 +2894,7 @@ static struct ceph_options *rbd_add_parse_args(struct rbd_device *rbd_dev, goto out_err; memcpy(*snap_name, buf, len); *(*snap_name + len) = '\0'; - *snap_name_len = len; + /* Initialize all rbd options to the defaults */ rbd_opts.read_only = RBD_READ_ONLY_DEFAULT; @@ -3131,7 +3127,6 @@ static ssize_t rbd_add(struct bus_type *bus, char *options; struct rbd_device *rbd_dev = NULL; char *snap_name; - size_t snap_name_len = 0; struct ceph_options *ceph_opts; struct ceph_osd_client *osdc; int rc = -ENOMEM; @@ -3154,7 +3149,7 @@ static ssize_t rbd_add(struct bus_type *bus, /* parse add command */ ceph_opts = rbd_add_parse_args(rbd_dev, buf, options, count, - &snap_name, &snap_name_len); + &snap_name); if (IS_ERR(ceph_opts)) { rc = PTR_ERR(ceph_opts); goto err_out_mem; diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 4fe14ff..cae7423 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2408,7 +2408,6 @@ static char *rbd_dev_v2_snap_name(struct rbd_device *rbd_dev, u32 which) int ret; void *p; void *end; - size_t snap_name_len; char *snap_name;