From patchwork Wed Jan 9 01:26:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Harmstone X-Patchwork-Id: 10753293 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E1B4514DE for ; Wed, 9 Jan 2019 01:28:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1B9C1FEBD for ; Wed, 9 Jan 2019 01:28:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C634728DD1; Wed, 9 Jan 2019 01:28:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A0DF1FEBD for ; Wed, 9 Jan 2019 01:28:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729800AbfAIB2U (ORCPT ); Tue, 8 Jan 2019 20:28:20 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:34219 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729652AbfAIB1r (ORCPT ); Tue, 8 Jan 2019 20:27:47 -0500 Received: by mail-wr1-f66.google.com with SMTP id j2so6042464wrw.1; Tue, 08 Jan 2019 17:27:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IZywItQ2oX/ZBjXbwHWNAbeG8HS0AjhKs6xoxmA33sY=; b=MVbuHnMA4TV1zIu2DJ2LKDBkaI0bLjX+Wjq1LClHRuI4FycM2v5cqfLn3pJmfoQ5/E bo7kKJm5RbS3ic3ruo/wydLD7Bsw2mqMPYo4W5rnxEAw1GFwK2OKcmkZIFLfTOpJh1fJ 08BICt/etPXuJ2vaiQ3eLgnt/xn3LpLvqaCaHgdRqeL7k+lwIvrjx1J/wjGb6kaO1lMM +dQJ5vYnxf+qrXTbRGG1y2wgJUsSgHu9ttffr37vBaR/YdmJ0c0LlnERfo+60jS0c0Zs Emha7O4Od/mJKL2UfCezDUNxw6sex+Np1awMW3RmKw0zc/4tWkrGZppMY3w3WayZVF3d Pj+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IZywItQ2oX/ZBjXbwHWNAbeG8HS0AjhKs6xoxmA33sY=; b=Ez/yrhEI2Vl4wsDRZVA+s3DncBaI5UmVm9Y13Oqo1YPp3EqY8yxBdbIHRfuhfrg25+ 6yXHi57RB4KsKVtMAcY4c55sjqQ/N1TdUnbn+/7Gj7fAW0RES+Le6wBkMfISXvP9ba9b of/kIjm8wkb8eIq5D426Yg5irnKIVM+GN/sczEWR34jO3tHRTwCm8ia2dofqiDEXER36 MCQVGWgFfsDRbKkbhXuecQNf+qj0BGEMHpcYz+uC7yvxX99mBzAFXsRSTbYVfjUnuA5x 0iNjR5akBgiAeybJWmYbOyYUQH8KGmorxUdPg4inMqOydV3aIARPJN7HMfeWzAdGqhmi HjfA== X-Gm-Message-State: AJcUuke7rqpNqeU+e8Oca3YQpTeDqRYqbhronM5Y3pHHWqGNIgaexCOE XMQm0BGLY105VvlJbZTMvKiLpzY2zRE= X-Google-Smtp-Source: ALg8bN5lISVHkNlV1kKviRkIO36BMoVdptPwDNWf7kKDCpJVE0dN/XmqbSz/QbBYZj/JCp+3z15u7g== X-Received: by 2002:adf:9dd2:: with SMTP id q18mr3129525wre.12.1546997265248; Tue, 08 Jan 2019 17:27:45 -0800 (PST) Received: from beren.harmstone.com ([88.97.13.154]) by smtp.gmail.com with ESMTPSA id y34sm156915088wrd.68.2019.01.08.17.27.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jan 2019 17:27:44 -0800 (PST) From: Mark Harmstone Cc: mark@harmstone.com, Chris Mason , Josef Bacik , David Sterba , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 15/19] btrfs: allow writing compressed, encrypted, inline extents Date: Wed, 9 Jan 2019 01:26:57 +0000 Message-Id: <20190109012701.26441-15-mark@harmstone.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190109012701.26441-1-mark@harmstone.com> References: <20190109012701.26441-1-mark@harmstone.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Mark Harmstone --- fs/btrfs/inode.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 61481833f5e4..f8bc7174f7e3 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -219,6 +219,22 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans, if (compress_type != BTRFS_COMPRESS_NONE) { struct page *cpage; int i = 0; + + if (enc_key) { + struct btrfs_file_extent_inline_enc *eienc; + + eienc = (struct btrfs_file_extent_inline_enc *)ptr; + + btrfs_set_file_extent_inline_enc_key_number(leaf, + eienc, enc_key->key_number); + + write_eb_member(leaf, eienc, + struct btrfs_file_extent_inline_enc, + iv, iv); + + ptr += sizeof(struct btrfs_file_extent_inline_enc); + } + while (compressed_size > 0) { cpage = compressed_pages[i]; cur_size = min_t(unsigned long, compressed_size,