Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp187818imu; Tue, 8 Jan 2019 17:31:19 -0800 (PST) X-Google-Smtp-Source: ALg8bN5FFKy6Q8zPHrgvzzGmpOGeFa8IeL+NJH805nRPRO0p/qji5/I1OLFR8c+X++dTE7P2j+pe X-Received: by 2002:a63:314d:: with SMTP id x74mr3588780pgx.10.1546997479877; Tue, 08 Jan 2019 17:31:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546997479; cv=none; d=google.com; s=arc-20160816; b=hEUcRJtS/pzO+ZIa+9p0NIaF5/kDUANSoGF3CxGCDWEawgbcShmmZe0nMlPY1fEmK3 u7g/d0ZYp70zlX31gTnAxB36tTn/01Va1E3xbdJSfTvSrVAYvMoMgAUcmwOuwkCZLdmI 6DMIs/FtBKGPm8CPlhQROqbFoXPDFhbNRJ1fbvCp9/RXX3xKqZcoOnWW4r9/O5CEtwML jNwd/TJqXggQFI/Mkayc67p5UNGO8+zYzNKlpTXTEDvXL3ErOoPmLg+0nhuxDSIP+osC i/6qDOnfXm9pXFwVbueLIELqFYr0rpbfGSECDPKk/CkzX8TPQyPiZCRfF9wej67QF/k2 E13Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=IZywItQ2oX/ZBjXbwHWNAbeG8HS0AjhKs6xoxmA33sY=; b=awuJUY1CGqm7sYeCcPgQvsS1bGxJbILnkfoJl3dcjyI4n3aJiNzFs+jMsM/AYnQDJh 5Nd4zFeGWidaHC7a98SewWATWU9dnEt68mi+HvhD12OqntyoS/tif2i1yxw7CQg6zmvE ad3VnnxxceldTmiUaMtPyGoP/8q+KhfI++auhXQi9B+hHH3vzoWrI0SOFRVz0XFNwJE9 Szb1n5DVKk6KU8pMr5+heS1sSBhl9EhSO8wfblNxOALT1oNrNy33e/mxj5zJOO0foYfa hoI1160+0khTmIxic81tU9+/SMsO4gb+Ak860ULd0x0cOPDM4K327j/6SIXIRg8iqLbo jTbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=MVbuHnMA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e127si31186321pfg.167.2019.01.08.17.31.04; Tue, 08 Jan 2019 17:31:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=MVbuHnMA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729813AbfAIB2U (ORCPT + 99 others); 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-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 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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, -- 2.19.2