From patchwork Tue Jan 22 22:29:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2021141 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 A4AEB3FD1A for ; Tue, 22 Jan 2013 22:29:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752763Ab3AVW3i (ORCPT ); Tue, 22 Jan 2013 17:29:38 -0500 Received: from mail-ie0-f182.google.com ([209.85.223.182]:38169 "EHLO mail-ie0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752683Ab3AVW3h (ORCPT ); Tue, 22 Jan 2013 17:29:37 -0500 Received: by mail-ie0-f182.google.com with SMTP id s9so12610784iec.27 for ; Tue, 22 Jan 2013 14:29:37 -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=D0LzdMCfvtgPueyi8SSQ5LU2mHU2UcW5BGxMbKwurZs=; b=F5KqAqhWdTw926LgXYCW4e2kQjI/5W1DyItOnIkGDOQKuCgvBp1fBFm8WXS1WwNxEF rsGJH4SJE5pI3oY/I7mVDySi0CHT6Uzb0OMT0exz6bN8HdIuo0ISyzqcndychTOlb6es 3TX9jgjWwKVWAl/sGFX/qBFv65RuwlM/yue9yo6C83LakLGdbqj/LAJTRlvU2MJM/wx6 UU+lahqrHK5LXbNYL8sIQgowHYrLZYmObuDcVAql9VzYQdhQDWqgaQMp0hlC72sTi/Yo t4CKsgJM36/nR5SaVdPK7/i8Gqt8xt3fFFnnhaX0KFFjtvekOpfL5N0rV5/X/M/NrB9u 5zxA== X-Received: by 10.50.151.207 with SMTP id us15mr13242992igb.10.1358893777151; Tue, 22 Jan 2013 14:29:37 -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 uj6sm12968537igb.4.2013.01.22.14.29.35 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Jan 2013 14:29:36 -0800 (PST) Message-ID: <50FF12CE.9080300@inktank.com> Date: Tue, 22 Jan 2013 16:29:34 -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] rbd: get rid of rbd_req_sync_read() References: <50FF11EA.3000808@inktank.com> In-Reply-To: <50FF11EA.3000808@inktank.com> X-Gm-Message-State: ALoCoQkBShQXirFl0PI0lrdjQYk8f46cK0XGV9HqCEcqcrLDtk8dExeWmzy4x/BQ3Tlcy4SZ9swc 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 --- drivers/block/rbd.c | 24 ------------------------ 1 file changed, 24 deletions(-) static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev, @@ -2109,7 +2086,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 5a8fef4..6193c69 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1294,29 +1294,6 @@ static int rbd_obj_request_wait(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 */