From patchwork Thu Jul 26 18:57:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1244141 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CBA473FC5A for ; Thu, 26 Jul 2012 18:57:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752431Ab2GZS5U (ORCPT ); Thu, 26 Jul 2012 14:57:20 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:34518 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752428Ab2GZS5U (ORCPT ); Thu, 26 Jul 2012 14:57:20 -0400 Received: by yenl2 with SMTP id l2so2332418yen.19 for ; Thu, 26 Jul 2012 11:57:19 -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=TI3Nt5FAPlMgjltlZ1WMLSJgUdopW6NpNFxRp2lKvVY=; b=Cf/ft7GCfHcBKUdHGwCGDJcv4WoE/hd2QpI35UGkFePGo1/aWjs3d10LUcETOsvR9/ AHVgioJaT1gDYHCDU6P2VBl3tTn8uKlUlM8AuXneexVJWgf7gwjyQ5Jn5S5S4KaFpJJn BUg+frIEQSBJcFTQ7nhCcVjsTILZKds03CkSoDr1idjT7gk/e2HfbT8ADwelrxzWpVuX 4o8MS/2lN3dlOd0uGk5Nr2GDopnCTomWeu/Ws1TteifdhUMWMjIr28tKNsuVd8rFIOu9 o/kCkR7zSgN5owGgbCxlbtJgBM6+elHvgzgKDjYnqLJr/JTNLTnR/LlfgboZ9sfsARdr Q5wQ== Received: by 10.236.76.165 with SMTP id b25mr21604941yhe.57.1343329039677; Thu, 26 Jul 2012 11:57:19 -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 j39sm15988ani.3.2012.07.26.11.57.18 (version=SSLv3 cipher=OTHER); Thu, 26 Jul 2012 11:57:18 -0700 (PDT) Message-ID: <5011930E.7060403@inktank.com> Date: Thu, 26 Jul 2012 13:57:18 -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 1/7] rbd: snapc is unused in rbd_req_sync_read() References: <50119076.1030307@inktank.com> In-Reply-To: <50119076.1030307@inktank.com> X-Gm-Message-State: ALoCoQl5e230PmoTcrxgA82QxmuLwDQmd5m+qYSJnYOrqONKglQeRYMUJMuisUOjYpa5Ir7Bxeje Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org The "snapc" parameter to in rbd_req_sync_read() is not used, so get rid of it. Reported-by: Josh Durgin Signed-off-by: Alex Elder --- drivers/block/rbd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 0fda2ed..64d3dbd 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1168,7 +1168,6 @@ static int rbd_req_read(struct request *rq, * Request sync osd read */ static int rbd_req_sync_read(struct rbd_device *rbd_dev, - struct ceph_snap_context *snapc, u64 snapid, const char *object_name, u64 ofs, u64 len, @@ -1615,7 +1614,7 @@ static int rbd_read_header(struct rbd_device *rbd_dev, return -ENOMEM; rc = rbd_req_sync_read(rbd_dev, - NULL, CEPH_NOSNAP, + CEPH_NOSNAP, rbd_dev->header_name, 0, len, (char *)dh, &ver);