From patchwork Thu Jul 19 21:08:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1218561 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 711F63FD48 for ; Thu, 19 Jul 2012 21:08:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751736Ab2GSVIh (ORCPT ); Thu, 19 Jul 2012 17:08:37 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:52993 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751673Ab2GSVIg (ORCPT ); Thu, 19 Jul 2012 17:08:36 -0400 Received: by mail-yw0-f46.google.com with SMTP id m54so3293293yhm.19 for ; Thu, 19 Jul 2012 14:08:36 -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=SF9BbQEl4w/Ps81GsNdbx+TO1aVvbldw/Xy5bpPRtac=; b=mm6bdDdaCODaOQRbqDnyI0SS+eP3i+VNr1En1YMnfur+od65nPDGU6hBZckk8p0qL5 anC9E/x7faQe2bKQi5PwBS+Phy9wglv+o2u6klWKwosufhFPKnOQR4z0CxIAsbcUCVYF EQoWeOBrj6mKUiGEjPsGY23ZH6BsZfttjloN1pjIVRekQe1GVlufhVAFM6Fhq61wbQWN hq9H+2fsxI+ZjvcSQez3KQbvIRpsEVWr43Bnx0GaAoND4ddDxIPYWrax0X5HIOK6G0jp Xaxe7V2PMbDbrNTf069kHHXgItF/RMpSbRRj7dUCvLkutsW0KT+uGntKRyxROl33KMaX dcnQ== Received: by 10.42.19.131 with SMTP id c3mr2136322icb.36.1342732116319; Thu, 19 Jul 2012 14:08:36 -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 wo5sm8145527igc.0.2012.07.19.14.08.35 (version=SSLv3 cipher=OTHER); Thu, 19 Jul 2012 14:08:35 -0700 (PDT) Message-ID: <50087753.8010900@inktank.com> Date: Thu, 19 Jul 2012 16:08:35 -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 05/12] rbd: snapc is unused in rbd_req_sync_read() References: <500874F5.4090205@inktank.com> In-Reply-To: <500874F5.4090205@inktank.com> X-Gm-Message-State: ALoCoQlYcygW9tnmtTVIEs2qHCZeY+sEHkCFm58aP3lkwfu7sgXJMFtQBNIH9RDP1VM/+ciAfzds 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 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 93b2447..06e022d 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1162,7 +1162,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, @@ -1609,7 +1608,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);