From patchwork Tue Apr 30 12:32:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2504421 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 56D603FD85 for ; Tue, 30 Apr 2013 12:32:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760565Ab3D3Mct (ORCPT ); Tue, 30 Apr 2013 08:32:49 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:44789 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760554Ab3D3Mct (ORCPT ); Tue, 30 Apr 2013 08:32:49 -0400 Received: by mail-ie0-f173.google.com with SMTP id k5so495231iea.18 for ; Tue, 30 Apr 2013 05:32:48 -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=UIL31SAqsKqLQnK6niIDcVNr8vRUZdfarynQh6UeaCo=; b=Dljwt50CJWX1mokjPitd6MrYtrYgvwc5kfimxvwISmCah8XDlRzCRNCOlobp9zX0xB ghwbL+O+b0Lvz85blfkyTfwYH2wKBUQjuSAyXiTlR1jeuLchas2LV9NSeoDc2go2aGAK cAJFLqTv1tIETvA7DL26BZwOxCqMZLXsK7Imv+icPoo5P4tH3k2St5RoftH7tZWna5eY IzXGiP2ubg0F907qrc+1gK3DvgI1H0h6c7lueV5JPCIGDO0kjwmXo5gTz1+dfmaqtlsS RMTbAYUKjV9NasXlFjsfPIOE2aMgwJOG8uXfcIzUegJD0ZZ/k4jAMixwJ7iqZ1tCSoCb 9AiA== X-Received: by 10.50.92.4 with SMTP id ci4mr3192082igb.96.1367325168894; Tue, 30 Apr 2013 05:32:48 -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 9sm22263444igy.7.2013.04.30.05.32.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Apr 2013 05:32:41 -0700 (PDT) Message-ID: <517FB9E8.8060408@inktank.com> Date: Tue, 30 Apr 2013 07:32:40 -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 5/5] rbd: drop obj_request->version References: <517FB909.40309@inktank.com> In-Reply-To: <517FB909.40309@inktank.com> X-Gm-Message-State: ALoCoQkRUAq1znhNOQtm4mgw5zjy9hdek1k98wboB3bMBHnSlc3TcBs6XAYN4n1CP8KnBmSF0ew9 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Nothing ever uses the version field maintained in the object request structure any more, so get rid of it. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index ddf4305..15e84d8 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -225,7 +225,6 @@ struct rbd_obj_request { struct ceph_osd_request *osd_req; u64 xferred; /* bytes transferred */ - u64 version; int result; rbd_obj_callback_t callback; @@ -1486,7 +1485,6 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req, if (osd_req->r_result < 0) obj_request->result = osd_req->r_result; - obj_request->version = le64_to_cpu(osd_req->r_reassert_version.version); BUG_ON(osd_req->r_num_ops > 2);