From patchwork Tue Feb 25 15:36:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 3717711 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7A21F9F39F for ; Tue, 25 Feb 2014 15:37:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 79DBC201EC for ; Tue, 25 Feb 2014 15:37:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A0A41201D3 for ; Tue, 25 Feb 2014 15:37:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752840AbaBYPg7 (ORCPT ); Tue, 25 Feb 2014 10:36:59 -0500 Received: from mail-lb0-f170.google.com ([209.85.217.170]:41634 "EHLO mail-lb0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752657AbaBYPgx (ORCPT ); Tue, 25 Feb 2014 10:36:53 -0500 Received: by mail-lb0-f170.google.com with SMTP id s7so519055lbd.29 for ; Tue, 25 Feb 2014 07:36:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=KzWJK6hnTzyOamVFnoditzGve0rI6y0WWQKtiyM3090=; b=ejZ17dlx7W5rKPgfPPrbdREBvq8bmwysnde8OXjDxV8Fd2U3FFlfPqULlru3KqTYEP 6V3U3Qi4J1M8deoLf/JFVUCLwfSfjHEVafSdXzDb03TCkI1T9k0A97xsT0YEyoSIEb1Y dHqM0hpEp3Ulxpikq/YG6fEx/VyQNs79VcGZnxkP0/+ZncssOADJQqXu9EO4jUETEGdV H83zTY1MJbDiF53p7QLuFx1drJhIb9AHHPcKZHvcXjvc2ZaLyAWx58b/pOVSU2GYEx1M rgCbKmxmtXi2bQgCn0r7ojUSnVrMGR6x5TNLb0ujs2lRs5skYrRDNuLhM+KZTmmNE8uh l6oA== X-Gm-Message-State: ALoCoQlAUe4rF+setr7D6nrHYt74BZeIBM+J31GJ9A5ET/QlwkLI6SslIXoVkoDJKPOAayeXygRF X-Received: by 10.152.43.47 with SMTP id t15mr336328lal.38.1393342612564; Tue, 25 Feb 2014 07:36:52 -0800 (PST) Received: from localhost ([109.110.66.27]) by mx.google.com with ESMTPSA id x4sm10579359lbn.2.2014.02.25.07.36.51 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 25 Feb 2014 07:36:51 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH v2 1/5] libceph: encode CEPH_OSD_OP_FLAG_* op flags Date: Tue, 25 Feb 2014 17:36:43 +0200 Message-Id: <1393342607-23653-2-git-send-email-ilya.dryomov@inktank.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1393342607-23653-1-git-send-email-ilya.dryomov@inktank.com> References: <1393342607-23653-1-git-send-email-ilya.dryomov@inktank.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Encode ceph_osd_op::flags field so that it gets sent over the wire. Signed-off-by: Ilya Dryomov Reviewed-by: Sage Weil Reviewed-by: Alex Elder --- include/linux/ceph/osd_client.h | 1 + include/linux/ceph/rados.h | 2 +- net/ceph/osd_client.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index fd47e872ebcc..e94f5da251d6 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h @@ -76,6 +76,7 @@ struct ceph_osd_data { struct ceph_osd_req_op { u16 op; /* CEPH_OSD_OP_* */ + u32 flags; /* CEPH_OSD_OP_FLAG_* */ u32 payload_len; union { struct ceph_osd_data raw_data_in; diff --git a/include/linux/ceph/rados.h b/include/linux/ceph/rados.h index 96292df4041b..8f9bf4570215 100644 --- a/include/linux/ceph/rados.h +++ b/include/linux/ceph/rados.h @@ -382,7 +382,7 @@ enum { */ struct ceph_osd_op { __le16 op; /* CEPH_OSD_OP_* */ - __le32 flags; /* CEPH_OSD_FLAG_* */ + __le32 flags; /* CEPH_OSD_OP_FLAG_* */ union { struct { __le64 offset, length; diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 0676f2b199d6..5d7fd0b8c1c8 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -688,7 +688,9 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req, return 0; } + dst->op = cpu_to_le16(src->op); + dst->flags = cpu_to_le32(src->flags); dst->payload_len = cpu_to_le32(src->payload_len); return request_data_len;