From patchwork Fri Feb 21 18:55:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 3699371 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 77729BF13A for ; Fri, 21 Feb 2014 18:56:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A9A52017D for ; Fri, 21 Feb 2014 18:56:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8008720179 for ; Fri, 21 Feb 2014 18:56:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755832AbaBUSz4 (ORCPT ); Fri, 21 Feb 2014 13:55:56 -0500 Received: from mail-ea0-f177.google.com ([209.85.215.177]:38052 "EHLO mail-ea0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755819AbaBUSzz (ORCPT ); Fri, 21 Feb 2014 13:55:55 -0500 Received: by mail-ea0-f177.google.com with SMTP id h10so386610eak.36 for ; Fri, 21 Feb 2014 10:55:54 -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=MciA5n2iEEWNLsNJ/EoBE57J+ALeEuhrRN09rwO8XSE=; b=f2QOqWxc5LLeHtMnlebF/FDIaOIVfRfX4sX3qWezflsbNpY1BH1eONatgi6I7v6Nab R0nEyr3SDRA6eB7ZZlOo3/n/GlJaEusecv+Ca9zJSw/6lDnbYCl1YJGlm6aMlgEpB5FN mqUKgmXO+uVSJTBDPB/DDbSp+zmRb1KNxN+Zb/zE60vnK+ImqI04T/vcs/MCObxe8kUW LSVO8y91lkdjwf5pP/ja64mFZdIXBKAiZohN6Zh8FzTb55QizemNE25W7p1TS46LbxqO a9ilQYfi/Si7DCK92D2Mnnfy44+Zq9k+MTEUHlhXdso7z6H3ht1Sclosbitx5GfAdp7Y S7nA== X-Gm-Message-State: ALoCoQnydZ+xz1Z0hYNcF6Y6O251HU2n2NpCtVBmSfz+UYlxbW/gGmXLVlNZNjosyBd20SElEhry X-Received: by 10.14.211.71 with SMTP id v47mr10225953eeo.37.1393008954248; Fri, 21 Feb 2014 10:55:54 -0800 (PST) Received: from localhost ([109.110.66.27]) by mx.google.com with ESMTPSA id 46sm29551162ees.4.2014.02.21.10.55.52 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 21 Feb 2014 10:55:53 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 1/6] libceph: encode CEPH_OSD_OP_FLAG_* op flags Date: Fri, 21 Feb 2014 20:55:41 +0200 Message-Id: <1393008946-7931-2-git-send-email-ilya.dryomov@inktank.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1393008946-7931-1-git-send-email-ilya.dryomov@inktank.com> References: <1393008946-7931-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=-7.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: 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;