From patchwork Sun Apr 21 21:16:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2469491 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 5D5A7DF230 for ; Sun, 21 Apr 2013 21:17:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751528Ab3DUVRA (ORCPT ); Sun, 21 Apr 2013 17:17:00 -0400 Received: from mail-ie0-f181.google.com ([209.85.223.181]:40344 "EHLO mail-ie0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751231Ab3DUVRA (ORCPT ); Sun, 21 Apr 2013 17:17:00 -0400 Received: by mail-ie0-f181.google.com with SMTP id tp5so3877711ieb.40 for ; Sun, 21 Apr 2013 14:17:00 -0700 (PDT) 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=FZ6cEFjItyZXJmCkNYDdpemDu5jQNnRq45KiP4jzGIg=; b=X98ZJZLfNZfz0tibbGpeOFSoZRsKHHlER/vYsGhERkeUlLaXE07oMfSWrCEa/EOymT MdZvyTRAv7ePiFjmO6W4ReLCos2eR6nlqgI6a1KR6WQx5ddoBMoPMN2+3Tpzsti+/OcK HT4AXSxUJT4iVenz5Enm8FxKrHAkfWMdItcdjinjfSeK79v9O3q8KQxXVvrgFeEgJR4C nAxd8t4vONpNG/It5NEbhz8z2trcJGBfzTqT19ylat0FHjVZTCPS5jLZVX2lYJiX5uSA 4c1EHyQcAg+yqcM++GYUGqSSHD5sdQ2LWCwT7ZJH4/1X5XKFTEDvKsBRZj4gXXOvKec6 Fbig== X-Received: by 10.50.11.138 with SMTP id q10mr20250198igb.5.1366579020027; Sun, 21 Apr 2013 14:17:00 -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 ESMTPSA id 8sm12884790igi.4.2013.04.21.14.16.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 21 Apr 2013 14:16:58 -0700 (PDT) Message-ID: <51745749.3010604@inktank.com> Date: Sun, 21 Apr 2013 16:16:57 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 1/2] rbd: give rbd_obj_read_sync() buffer void type References: <5174571C.4010203@inktank.com> In-Reply-To: <5174571C.4010203@inktank.com> X-Gm-Message-State: ALoCoQlF6l8/pR8mNHVOnZlyREZOqmUy/9MdNbvTsk39pr0nLqm58ZMMeuXc2eoXHqj2gDF97I61 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Make the buf parameter into which the data is to be read have type void pointer. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) if (WARN_ON((size_t) ret < size)) { diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 5724d41..e6da301 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2854,7 +2854,7 @@ static void rbd_free_disk(struct rbd_device *rbd_dev) static int rbd_obj_read_sync(struct rbd_device *rbd_dev, const char *object_name, u64 offset, u64 length, - char *buf, u64 *version) + void *buf, u64 *version) { struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc; @@ -2957,8 +2957,7 @@ rbd_dev_v1_header_read(struct rbd_device *rbd_dev, u64 *version) return ERR_PTR(-ENOMEM); ret = rbd_obj_read_sync(rbd_dev, rbd_dev->header_name, - 0, size, - (char *) ondisk, version); + 0, size, ondisk, version); if (ret < 0) goto out_err;