From patchwork Tue Dec 13 06:59:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9471833 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A04E360760 for ; Tue, 13 Dec 2016 07:00:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9287C284DC for ; Tue, 13 Dec 2016 07:00:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8743E284EF; Tue, 13 Dec 2016 07:00:53 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 16409284DC for ; Tue, 13 Dec 2016 07:00:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752056AbcLMHAw (ORCPT ); Tue, 13 Dec 2016 02:00:52 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33959 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751985AbcLMHAw (ORCPT ); Tue, 13 Dec 2016 02:00:52 -0500 Received: by mail-pf0-f194.google.com with SMTP id y68so5556156pfb.1 for ; Mon, 12 Dec 2016 23:00:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=HVsCSJQthkEez09sbVHjj48vSzoJWQLsm3Hb4FP43xo=; b=0WRsSV8tQfK/8DFgCl7086wRGxqI3x/ElBKdYbqSpqRz/Sqma/LhJaHLglkdNjYbDv 4lWtlZYZMw8v6IgR0xH90ulcF8iK3WTmEA/Q0sBhvBdKyn9+LbUOgYo24s4tncy6yobI li13AVNJRbmW3VTR+Ge5wL9Ss8YM87rippdU7r8Th9fiNahiLdkYxVpGW97dDAyxNlso RyNYex8qhjbfWeaOdFwsIdGw0QEnnzJ0ml34fNYFiQmqHM9eQz8TKC0OrIGvm6b4Q9ZQ keadDrERO7P5grsuFHURK8NoLx/3xrlBnUo+9HZ7LH1N0VHo0vY8vrMryDy/wW+TUfJ3 pBDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=HVsCSJQthkEez09sbVHjj48vSzoJWQLsm3Hb4FP43xo=; b=P4rfFAjKGLlJ5zUra3WoVOjwQg9JFqNW2rVe9KKGuA50+ZKKO5RZPBVzxOz4SOozC8 S+zw+vMnmn1VKzwb1+1jdQwLKcaTBDP8hHyxiZzrlEWwIWUrAhHxBOrtJW0KnsqR4yKP QBsb0DeFaXWbaE+HpErX86AOF9Ph3BdQxaNNJ+W6Ty+Ml/19+ZOvMc1SIeFHVkg1mbZE MZGO730tWoAkwb25JmVJZnMpA2RNg0QWkieWXyTh2cSzePlVwyFY7ffp7n4UL3e8rW/m gGbeFISBI92YjhouEqzTXyxYicUR9qtJLbyD7JZMOfye85KvIAZRANug0sFyMaz2jdif cKoA== X-Gm-Message-State: AKaTC02OAAYCRI4QV6k9TwXq9g4h9tp7nlgrXgR0rDkV9HfQSgLaKvzC4aVrlighxhdA/Q== X-Received: by 10.98.78.88 with SMTP id c85mr100177927pfb.138.1481612451644; Mon, 12 Dec 2016 23:00:51 -0800 (PST) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.119.30.131]) by smtp.gmail.com with ESMTPSA id w5sm79053707pfl.31.2016.12.12.23.00.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Dec 2016 23:00:51 -0800 (PST) From: Eric Biggers To: "Theodore Y . Ts'o" Cc: fstests@vger.kernel.org, Eric Biggers Subject: [PATCH] xfstests-bld: format filesystem with '-O encrypt' in encrypt config Date: Mon, 12 Dec 2016 22:59:41 -0800 Message-Id: <1481612381-65741-1-git-send-email-ebiggers3@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers We were relying on the kernel setting the 'encrypt' feature flag for us. We should just do it in userspace when formatting the filesystem. Signed-off-by: Eric Biggers --- kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/encrypt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/encrypt b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/encrypt index 390e205..320eff0 100644 --- a/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/encrypt +++ b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/encrypt @@ -1,5 +1,5 @@ SIZE=small -export MKFS_OPTIONS="" +export MKFS_OPTIONS="-O encrypt" export EXT_MOUNT_OPTIONS="test_dummy_encryption" REQUIRE_FEATURE=encryption TESTNAME="Ext4 encryption"