From patchwork Thu Jan 24 16:33:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2033781 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 B7A0DDF264 for ; Thu, 24 Jan 2013 16:33:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751787Ab3AXQdk (ORCPT ); Thu, 24 Jan 2013 11:33:40 -0500 Received: from mail-ia0-f173.google.com ([209.85.210.173]:60985 "EHLO mail-ia0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751778Ab3AXQdj (ORCPT ); Thu, 24 Jan 2013 11:33:39 -0500 Received: by mail-ia0-f173.google.com with SMTP id l29so5080645iag.32 for ; Thu, 24 Jan 2013 08:33:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=odvQujLyMEzGX2vnvRR7rymBzs/pcNWt60PuhexTqX8=; b=lJV5xtaRlqh39hKh+AJCJIbLnfx33YZrlTcuXKlEPxLbiBsY+DQbzPskPuWl2foV8W TVLAplmVGN9b4+a4naLX5SLoNuuTyFHsw7KWCGAOUaocEANwyzJRg9diXka7kp6u8Mwj zmA6MaxOPde0IW6Dskcb6J1VcCODZ0hothrlROOsWMnwkeF1IDG05v3Jwuxn6gJLtJVx 6nG9GZqYPKxNacUYqq8g4GhuRP2VQcFfnV3uTHrqWBj2e3fhhaGXnSKSTBCV5uSxLNdL vYgMsTt9ERovM5KTzxhKPNZSveeRd1PbZT+l5QhjdVJyK2gGW6RRRplr35bgv47/p3UN JsBQ== X-Received: by 10.43.124.130 with SMTP id go2mr1554563icc.8.1359045219383; Thu, 24 Jan 2013 08:33:39 -0800 (PST) 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 u4sm1587438igw.6.2013.01.24.08.33.37 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Jan 2013 08:33:38 -0800 (PST) Message-ID: <51016261.8010609@inktank.com> Date: Thu, 24 Jan 2013 10:33:37 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: "ceph-devel@vger.kernel.org" Subject: [PATCH 05/12, v2] rbd: get rid of rbd_req_sync_read() References: <50FF11EA.3000808@inktank.com> <50FF128B.1030405@inktank.com> <5101406E.4060602@inktank.com> In-Reply-To: <5101406E.4060602@inktank.com> X-Gm-Message-State: ALoCoQm87+Z3iA5YGBdqQi5cokmA9KAuecRBXrkmoh547weyEtClA1VE2DzSE/nI7jwD0ar5xzyd Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Delete rbd_req_sync_read() is no longer used, so get rid of it. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 24 ------------------------ 1 file changed, 24 deletions(-) static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev, @@ -2113,7 +2090,6 @@ rbd_dev_v1_header_read(struct rbd_device *rbd_dev, u64 *version) if (!ondisk) return ERR_PTR(-ENOMEM); - (void) rbd_req_sync_read; /* avoid a warning */ ret = rbd_obj_read_sync(rbd_dev, rbd_dev->header_name, 0, size, (char *) ondisk, version); diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 742236b..750fc73 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1315,29 +1315,6 @@ static void rbd_obj_request_complete(struct rbd_obj_request *obj_request) } /* - * Synchronously read a range from an object into a provided buffer - */ -static int rbd_req_sync_read(struct rbd_device *rbd_dev, - const char *object_name, - u64 ofs, u64 len, - char *buf, - u64 *ver) -{ - struct ceph_osd_req_op *op; - int ret; - - op = rbd_osd_req_op_create(CEPH_OSD_OP_READ, ofs, len); - if (!op) - return -ENOMEM; - - ret = rbd_req_sync_op(rbd_dev, CEPH_OSD_FLAG_READ, - op, object_name, ofs, len, buf, ver); - rbd_osd_req_op_destroy(op); - - return ret; -} - -/* * Request sync osd watch */